- 14 Jul, 2016 16 commits
-
-
winniehell authored
-
Fatih Acet authored
Fix import_data being saved as a result of an invalid import_url Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19479 Seem that in all cases the `import_url` was an empty string. The `import_url` is now validated correctly and no longer creates the `import_data`even if it fails validation. <= Should cover cases 1, 3, and 4 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 Also, it now rescues from all exceptions when importing from a URL, so we make sure the `import_status` is failed after that. Covers case 2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 See merge request !5206
-
Job van der Voort authored
Cleanup feature proposal template ## What does this MR do? Changes the recommended template for feature proposals. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? I've been using the template for a while, and find that putting so many words into the h2 makes me think there's actual content there, until I realize I'm just reading the template text (again). I think we can get away with just putting `Description` as the header, and putting the suggested content for that section as plain text below for someone to replace. ## What are the relevant issue numbers? ## Screenshots (if relevant) ![image](/uploads/20a99c98a12aad84c1a7ec020f365b2f/image.png) /cc @JobV See merge request !5240
-
Fatih Acet authored
Use default cursor for table header of project files ## What does this MR do? Use default cursor for table header of project files. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? The table header had a pointer cursor even though it was not clickable. ## What are the relevant issue numbers? fixes #19612 See merge request !5165
-
Fatih Acet authored
Added shortcut to focus filters ## What does this MR do? Adds shortcut `f` to focus filter inputs. ## Are there points in the code the reviewer needs to double check? Is this a valid implementation? Please check [this comment below](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4570#note_12359978)! ## Why was this MR needed? Keyboard ninja UX
⚔ ## What are the relevant issue numbers? Closes #18120. ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_18.34.56](/uploads/d4cfb6ec340c118f5227be3f16ffbed1/Screen_Shot_2016-06-09_at_18.34.56.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 - [ ] 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 !4763 -
James Lopez authored
-
winniehell authored
-
Fatih Acet authored
Aria labels on top header links ## What does this MR do? Added `aria-label` to the links in top header bar for accessibility. ## What are the relevant issue numbers? Closes #12797 See merge request !5205
-
Fatih Acet authored
Added author username tooltip in issuable header ## What does this MR do? Adds the authors username as a tooltip to the header of issuables ## What are the relevant issue numbers? Closes #13771 ## Screenshots (if relevant) ![Screen_Shot_2016-07-12_at_16.00.34](/uploads/9485150f1c9d4006384f18d08a07430f/Screen_Shot_2016-07-12_at_16.00.34.png) See merge request !5209
-
Dmitriy Zaporozhets authored
Improves left static sidebar behaviour List of changes: * removed bottom 50px space that is no longer necessary with pin button at the top * increased side padding so sidebar links are closer to counters * use fixed weight pin icon so it correctly aligned with counters cc @annabeldunstone @jschatz1 See merge request !5251
-
Robert Schilling authored
Fix duplicated entry in changelog [ci skip] ## What does this MR do? Removes duplicate changelog entries. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19822 See merge request !5252
-
Robert Schilling authored
-
Dmitriy Zaporozhets authored
List of changes: * removed bottom 50px space that is no longer necessary with pin button at the top * increased side padding so sidebar links are closer to counters * use fixed weight pin icon so it correctly aligned with counters Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Add a UI guide note about number_with_delimiter See merge request !5220
-
Achilleas Pipinellis authored
Include default callback URL (OAuth) ## What does this MR do? Adds information on the OAuth callback URL ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? This information was missing. ## What are the relevant issue numbers? http://www.twitter.com/designingcode/status/753511397124866049 ## 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) See merge request !5246
-
Chris Wilson authored
-
- 13 Jul, 2016 24 commits
-
-
Mark Pundsack authored
-
Robert Speicher authored
Fix markdown rendering for label references Fixes #14424, #19753, #19760 See merge request !5224
-
Robert Speicher authored
Upgrade Rails from 4.2.6 to 4.2.7. Primarily just bug fixes. See merge request !5236
-
Douglas Barbosa Alexandre authored
-
Robert Speicher authored
This reverts commit 9ca633eb, reversing changes made to fb229bbf.
-
Connor Shea authored
Primarily just bug fixes. Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7
-
Robert Speicher authored
Actually render old and new sections of parallel diff next to each other See merge request !5173
-
Douwe Maan authored
Dropdown loading time preformance fix ## What does this MR do? Optimizes the performance of the dropdown load time by just sending the required data to load the dropdown instead of the full object This MR aims to fix #17474 See merge request !5113
-
Douwe Maan authored
Keeps issue number when importing from Gitlab.com ## What does this MR do? Keeps issue number when importing from `Gitlab.com` ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? With these changes we doesn't loose the issue references when importing from `GitLab.com`. ## What are the relevant issue numbers? Closes #15235 /cc @cpm @jweerdt See merge request !5193
-
James Lopez authored
-
tiagonbotelho authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
With these changes we don’t lost the issue references when importing from `GitLab.com`.
-
Kamil Trzciński authored
Fix Knapsack report generation for Spinach ## What does this MR do? Makes Knapsack auto-balacing work for Spinach tests ## Why was this MR needed? We used wrong Knapsack adapter, thus making spinach to run split, but not auto-balanced tests for spinach. See merge request !5230
-
James Lopez authored
-
James Lopez authored
-
Rémy Coutable authored
Allow developers to merge into a protected branch without having push access ## What does this MR do? Adds a "Developers can merge" checkbox to protected branches much like the "Developers can push" checkbox. When the checkbox is enabled, a developer can merge MRs into that protected branch from the Web UI and from the command-line (any push that is entirely composed of merge commits is allowed). ## Are there points in the code the reviewer needs to double check? - This MR refactors the `GitAccess` module, moving parts of it to `UserAccess` and the new `ChangeAccessCheck`. - This MR refactors `GitAccessSpec`, which generates a "matrix" of tests. - The main logic "developers can merge" should be straightforward enough. - The commits are fairly atomic, and the commit messages are descriptive regarding the motivations behind every change. ## Why was this MR needed? A significant portion of this feature was implemented in !4220 (thanks, @mvestergaard!) ; I'm wrapping it up. ## What are the relevant issue numbers? #18193 Closes #967 ## Screenshots ![1](/uploads/c636e88ba38628211754e7cf122b0dc4/1.png) ![2](/uploads/5ed1e7917e2f36853a479faa565b022a/2.png) ![3](/uploads/0d202ba42e8dc6aade7bc6ac8db41ee6/3.png) ## TODO - [ ] #18193 !4892 Add "developers can merge" as an option for protected branches - [x] Review existing code - [x] Fix build - [x] Implementation / refactoring - [x] Clean up `GitAccess` - [x] Clean up `protected_branches.js.coffee` - [x] Figure out authorization issue - If we try to merge code into a protected branch for a user who doesn't have access to that branch, an auth check will fail - We need to get around this, somehow - [x] Try detecting merge commits and allowing those - [x] A push with regular commits _and_ merge commits should fail - [x] Figure out a solution - [x] Extensive tests for `MergeCommitCheck` - [x] Add tests - [x] Untested parts of original MR - [x] Improve the checks in `/allowed` - @dzaporozhets's proposal: - commits in push == commits in merge request - branch to push == target branch of merge request - merge request has required amount of approves (ee only) - merge commit in push == merge commit we created when merged via UI - save merge commit sha in database and compare with `newrev` - my proposal - /allowed finds all open merge requests with the appropriate target branch - For each MR, compare the commit SHAs in the MR to the commit SHAs in the change set - If we have a match, compare the diff of the matching MR to the diff of the change set - If we still have a match, the merge is legit - [x] Wait for replies on my proposal - [x] Pick a strategy - [x] Implementation - [x] Save `in_progress_merge_commit_sha` - [x] Check `in_progress_merge_commit_sha` - [x] Clear `in_progress_merge_commit_sha` - [x] Test / refactor - [x] Merge conflicts - [x] Verify workflows - [x] Developer with 'developer can merge' on: - [x] Can merge an MR from the Web UI - [x] Error message for conflicts in the Web UI - [x] Cannot merge an MR from the command line (HTTP) - [x] Cannot merge an MR from the command line (SSH) - [x] Cannot modify the branch otherwise - [x] Developer with 'developer can merge' off: - [x] Cannot merge an MR from the Web UI - [x] Error message for conflicts in the Web UI - [x] Cannot merge an MR from the command line (HTTP) - [x] Cannot merge an MR from the command line (SSH) - [x] Cannot modify the branch otherwise - [x] New projects created could have have "Developers can merge" turned on automatically for the default branch - [x] CHANGELOG - [x] Fix build - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/42624e3d53754064186d4ae9048e310d1d3eed0b/builds) to pass - [x] Screenshots - [x] Assign to endboss - [x] Respond to @dbalexandre's comments - [x] Duplicated line, this is equals to line 26. - [x] We aren't using any of these helpers in this migration, we can remove the include. - [x] What do you think to add a default value for this column to avoid the Three-state Boolean Problem? - [x] group all checks under Gitlab::Checks - [x] You have a default value for developers_can_merge column, but your migration doesn't add it. - [x] What do you think to rename Partially protected to anything else? - [x] Fix conflicts - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/b1cfd42f20a78fd7f844288954e97cff32962e20/builds) passes - [ ] Wait for merge See merge request !4892
-