- 18 8月, 2016 1 次提交
-
-
由 Jack Davison 提交于
* Code in ruby now uses Array#to_sentence to construct award tooltips * Coffeescript uses a combination of regexes for the same result
-
- 17 8月, 2016 24 次提交
-
-
由 Jack Davison 提交于
* If the current user is not in the list output will have 1-9 users * If the current user is in the list output will be "me, " + 0-9 users
-
由 Jack Davison 提交于
* Only the first 10 names are displayed * Further users are indicated by "and X more." * String "and X more" is appended to the array THEN join is called * An oxford comma seperates the last name from "and X more" * In coffeescript "me" is now always prepended * Tests included
-
由 Yorick Peterse 提交于
Move to project dropdown with infinite scroll for better performance See merge request !5828
-
由 Paco Guzman 提交于
Use just SQL to check is a user can admin_issue on a project Tradeoff - we duplicate how we check admin_issue in a SQL relation in the Ability class
-
由 Jacob Schatz 提交于
Fix error message for existing labels in right sidebar. ## What does this MR do? Fixes flash notification in right sidebar, if we want to create an existing label. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? Because it was broken. ## What are the relevant issue numbers? Fixes #20117 ## Screenshots (if relevant) #### Before ![https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png) #### After ![Screen_Shot_2016-07-28_at_13.38.03](/uploads/1dca73bf4c1b14c0044952a5032d9325/Screen_Shot_2016-07-28_at_13.38.03.png) ![Screen_Shot_2016-07-28_at_13.41.18](/uploads/9b814f7f03d0314050659e1ac6ace290/Screen_Shot_2016-07-28_at_13.41.18.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [ ] ~~Added for this feature/bug~~ - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5546
-
由 Jacob Schatz 提交于
Don't show comment button in gutter of diffs on MR discussion tab When browsing to an MR, switching to the Changes tab, and switching back to the Discussions tab, the gutter of the diffs on that page would show the comment button on-hover, while it shouldn't, since comments on new lines can only be created from the Changes tab. ![Screen_Shot_2016-07-25_at_22.01.11](/uploads/6b044e1a3ecb34ddaa0af432833473aa/Screen_Shot_2016-07-25_at_22.01.11.png) `8-10-stable` counterpart at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5493 See merge request !5492
-
由 Patricio Cano 提交于
Updated Akismet documentation Updated Akismet documentation See merge request !5821
-
由 Robert Speicher 提交于
[ci skip]
-
由 Jacob Schatz 提交于
Add hover state to todos ## What does this MR do? - Add a hover state to todos like for repository files. - Fix button alignment in todos - Add link to avatar in todos ## Are there points in the code the reviewer needs to double check? The `border-collapse` part—is there any better way? ## Why was this MR needed? Make hover states consistent. ## What are the relevant issue numbers? fixes #19833 ## Screenshots ### Before ![before](/uploads/cd2e7b234bf08fac48aebb60cdfa26a9/before.png) ### After ![todos-list](/uploads/592457050cb3ff2c43dfcce78418c50b/todos-list.png) ![todos-list-last-hover](/uploads/532714333bc74d1656a5c767012b4cdd/todos-list-last-hover.png) ![todos-mobile](/uploads/d542b04ddebc9d4354d57151dd04c0d2/todos-mobile.png) See merge request !5361
-
由 Patricio Cano 提交于
-
由 winniehell 提交于
-
由 Jacob Schatz 提交于
Changed project description width ## What does this MR do? Changes the width of the project description to a max of `700px` ## What are the relevant issue numbers? Closes #20020 ## Screenshots (if relevant) ![Screen_Shot_2016-07-21_at_12.51.59](/uploads/567f5b11553b45baa7fb07156e46b727/Screen_Shot_2016-07-21_at_12.51.59.png) See merge request !5397
-
由 Jacob Schatz 提交于
Fixed width on project visibility icon in project list ## What does this MR do? Gives fixed width to the project visibility icons in the project list so that they all correctly line up with each other. ## What are the relevant issue numbers? Closes #19583 ## Screenshots (if relevant) ![Screen_Shot_2016-07-07_at_12.49.58](/uploads/bffa097c5c0e0a1339bbd4d7ea15d84f/Screen_Shot_2016-07-07_at_12.49.58.png) See merge request !5137
-
由 Robert Speicher 提交于
Implement pipeline hooks, extracted from !5525 Closes #20115 See merge request !5620
-
由 Jacob Schatz 提交于
Highlight empty lines ## What does this MR do? Rather than just highlight the text, file line highlighting now highlights the full line including empty lines ## What are the relevant issue numbers? Closes #19484 ## Screenshots (if relevant) ![Screen_Shot_2016-07-05_at_13.52.31](/uploads/d3bddc918d731681465381e96c0aa2b0/Screen_Shot_2016-07-05_at_13.52.31.png) See merge request !5092
-
由 Kamil Trzcinski 提交于
-
由 Douwe Maan 提交于
Load issue templates from repository part of #18656 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4981
-
由 Douwe Maan 提交于
Backport changes from gitlab-org/gitlab-ee!581 ## What does this MR do? Backports changes that were made in gitlab-org/gitlab-ee!581, to avoid potential merge conflicts in the future. ## What are the relevant issue numbers? - Related to gitlab-org/gitlab-ee!581 ## Does this MR meet the acceptance criteria? ## Tasks - [ ] !5824 Backport changes from EE!581 to CE - [x] Implementation - [x] ::ProtectedBranches::CreateService.new - [x] Can't remove `load_protected_branches_gon_variables` - [x] `has_many` with count enforced - [x] Extract from access levels - [x] project.protected_branches.create(params) - [x] Improve "access_levels.first" - [x] Fix tests - [x] Fix build - [x] Assign to Douwe - [ ] Wait for review/merge See merge request !5824
-
由 Felipe Artur 提交于
-
由 Timothy Andrew 提交于
-
由 Ruben Davila 提交于
-
由 Achilleas Pipinellis 提交于
Added documentation on adding database indexes ## What does this MR do? This MR adds a guide on when to add database indexes, how to approach this problem, etc ## Are there points in the code the reviewer needs to double check? Spelling, grammar, etc ## Why was this MR needed? Blindly adding indexes can be harmful to the database, and I recently had to remove 48-something unused indexes. ## What are the relevant issue numbers? #20767 ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5771
-
由 Timothy Andrew 提交于
- Use assertions in the vein of `merge_access_levels.map(&:access_level)` instead of `merge_access_levels.first.access_level`
-
由 Rubén Dávila Santos 提交于
Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'" This reverts merge request !5417
-
- 16 8月, 2016 15 次提交
-
-
由 Jacob Schatz 提交于
Add reference to product map. ## What does this MR do? Mention the product map in the UI Guide and remove a line that says that the GitLab logo and user picture and in the sidebar. ## What are the relevant issue numbers? 19350 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #19350 See merge request !5769
-
由 Timothy Andrew 提交于
- `#find_users` depends on a project being loaded. - Missed adding this in 2193ae22
-
由 Timothy Andrew 提交于
- This is an optimization that was made in !581, and it needs to be backported to CE to avoid merge conflicts in the future.
-
由 Timothy Andrew 提交于
- Previously created a protected branch manually, without using a factory.
-
由 Timothy Andrew 提交于
1. `GitPushService` was still using `{merge,push}_access_level_attributes` instead of `{merge,push}_access_levels_attributes`. 2. The branches API creates access levels regardless of the state of the `developers_can_{push,merge}` parameters. This is in line with the UI, where Master access is the default for a new protected branch. 3. Use `after(:build)` to create access levels in the `protected_branches` factory, so that `factories_spec` passes. It only builds records, so we need to create access levels on `build` as well.
-
由 Kamil Trzcinski 提交于
-
由 Timothy Andrew 提交于
1. Previously, we were using `after_create` to create access levels. 2. At the time of protected branch creation, there are _no_ access levels present, which is invalid, and creation fails. 3. Fixed by setting access levels before the protected branch is created.
-
由 Timothy Andrew 提交于
1. Change a few incorrect `access_level` to `access_levels.first` that were missed in e805a647. 2. `API::Entities` can iterate over all access levels instead of just the first one. This makes no difference to CE, and makes it more compatible with EE.
-
由 Timothy Andrew 提交于
1. To improve EE compatibility.
-
由 Timothy Andrew 提交于
1. This is in regard to the protected branches feature spec. 2. For example, if "Masters" is already selected, don't re-select "Masters" during the spec. 3. This is due to a bug in the frontend implementation, where selecting an already-selected access level _deselects_ it, which is something we don't need. I'll create a separate issue for this. 4. This hasn't turned up before, because we were manually creating missing access levels prior to e805a647. Now, we just use nested attributes, and missing access levels fail validation.
-
由 Timothy Andrew 提交于
!581 has a lot of changes that would cause merge conflicts if not properly backported to CE. This commit/MR serves as a better foundation for gitlab-org/gitlab-ee!581. = Changes = 1. Move from `has_one {merge,push}_access_level` to `has_many`, with the `length` of the association limited to `1`. This is _effectively_ a `has_one` association, but should cause less conflicts with EE, which is set to `has_many`. This has a number of related changes in the views, specs, and factories. 2. Make `gon` variable loading more consistent (with EE!581) in the `ProtectedBranchesController`. Also use `::` to prefix the `ProtectedBranches` services, because this is required in EE. 3. Extract a `ProtectedBranchAccess` concern from the two access level models. This concern only has a single `humanize` method here, but will have more methods in EE. 4. Add `form_errors` to the protected branches creation form. This is not strictly required for EE compatibility, but was an oversight nonetheless.
-
由 Stan Hu 提交于
Upgrade httpclient gem from 2.7.0.1 to 2.8.2. Fixes deprecation warnings from Ruby 2.3. Resolves #20950. Changelog: https://github.com/nahi/httpclient/blob/b51d7a8bb78f71726b08fbda5abfb900d627569f/CHANGELOG.md#changes-in-282 cc: @stanhu See merge request !5816
-
由 Robert Speicher 提交于
Submit to Akismet Part 1 (Issues) Related to #5932 #5573 gitlab-com/infrastructure#14 See merge request !5538
-
由 Robert Speicher 提交于
Add rspec feature tests for the diff notes feature. ## What are the relevant issue numbers? Closes #19957. See merge request !5417
-
由 Patricio Cano 提交于
-