summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Stop new merge request page tabs updating the URLmr-new-page-changing-urlPhil Hughes2017-04-052-1/+6
| | | | | | | | The tabs on the merge_requests#new where changing the URL to URLs meant for merge_requests#show. The URL don't actually exist on the new page, so the simplest solution is to not update the URL for this page. Closes #30419
* Merge branch 'sh-fix-ssh-keys-with-spaces' into 'master' Sean McGivern2017-04-053-1/+14
|\ | | | | | | | | Handle SSH keys that have multiple spaces between each marker See merge request !10466
| * Handle SSH keys that have multiple spaces between each markerStan Hu2017-04-043-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Notice what happens when a user adds a key with a space in between: ``` irb(main):004:0> 'ssh-rsa foobar'.split(/ /) => ["ssh-rsa", "", "foobar"] ``` This would cause gitlab-shell to receive a blank argument for the actual key, leading to users unable to login.
* | Update CHANGELOG.md for 9.0.3James Lopez2017-04-0515-58/+17
|/ | | [ci skip]
* Merge branch 'backport-transient-failure-1567' into 'master'Rémy Coutable2017-04-041-0/+4
|\ | | | | | | | | Backport changes of ee fix for transient failure in environments spec See merge request !10459
| * Backport changes of ee fix for transient failure in environments specFilipa Lacerda2017-04-041-0/+4
| |
* | Merge branch 'simple-ci-sourcemaps' into 'master' Clement Ho2017-04-041-1/+2
|\ \ | | | | | | | | | | | | Use a less memory-intensive sourcemap when running in CI See merge request !10460
| * | use a less memory-intensive sourcemap when running in CIMike Greiling2017-04-041-1/+2
| |/
* | Merge branch '30461-fix-transient-failure' into 'master' Robert Speicher2017-04-041-3/+3
|\ \ | |/ |/| | | | | | | | | Fix a transient spec failure in "Admin Health Check" feature spec Closes #30461 See merge request !10454
| * Fix a transient spec failure in "Admin Health Check" feature spec30461-fix-transient-failureRémy Coutable2017-04-041-3/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fix-password-required-check' into 'master' Rémy Coutable2017-04-043-0/+37
|\ \ | | | | | | | | | | | | | | | | | | Inlude the password_automatically_check param as permitted config in the user create_service Closes #30335 See merge request !10386
| * | Inlude the password_automatically_check param as permitted config in the ↵fix-password-required-checkDJ Mountney2017-04-043-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | user create_service This param is passed to service in two places, one is in the build_user for non ldap oauth users. And the other is in the initial production admin user seed data. Without this change, when setting up GitLab in a production environment, you were not being given the option of setting the root password on initial setup in the UI.
* | | Merge branch 'rs-sign-in-poc' into 'master' Rémy Coutable2017-04-041-9/+11
|\ \ \ | | | | | | | | | | | | | | | | Use `sign_in` instead of `login_as` when we're not testing login flow See merge request !10296
| * | | Use `sign_in` instead of `login_as` when we're not testing login flowRobert Speicher2017-04-041-9/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a proof of concept for gitlab-org/gitlab-ce#30196. The actual login procedure is well-tested by `spec/features/login_spec.rb`, and we don't gain anything by also thoroughly testing it here, in our second-slowest feature spec. In fact, it only slows us down! So instead we use `sign_in` from the `Devise::Test::IntegrationHelpers` module, which just sets the current user at the Warden level. This drastically reduces the "setup" phase of every test in this file. A non-scientific test run saw this drop from 633 to 231 seconds.
* | | Merge branch '28732-expandable-folders' into 'master' Alfredo Sumaran2017-04-0410-30/+406
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Expandable folders for environments" Closes #28732 See merge request !10290
| * | Adds tests for scoped tabs28732-expandable-foldersFilipa Lacerda2017-03-311-0/+36
| | |
| * | Adds tests that were only in EEFilipa Lacerda2017-03-291-21/+68
| | |
| * | Changes after reviewFilipa Lacerda2017-03-293-19/+17
| | |
| * | Fix broken testFilipa Lacerda2017-03-282-2/+2
| | |
| * | Changes after reviewFilipa Lacerda2017-03-284-12/+7
| | |
| * | Adds show all buttonFilipa Lacerda2017-03-2810-81/+287
| | |
| * | Adds expandable folder back.Filipa Lacerda2017-03-285-19/+100
| | | | | | | | | | | | Makes request to get environments
| * | Add back expandable folders behaviorFilipa Lacerda2017-03-282-0/+13
| | |
* | | Merge branch '29432-prevent-click-disabled-btn' into 'master' Alfredo Sumaran2017-04-044-29/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent clicking on disabled button Closes #29432 See merge request !9931
| * | | Show BS Tooltips on disabled GitLab export button29432-prevent-click-disabled-btnKushal Pandya2017-03-291-5/+6
| | | |
| * | | Update styles to bind tooltips to button wrapperKushal Pandya2017-03-291-9/+2
| | | |
| * | | Update testsKushal Pandya2017-03-281-6/+2
| | | |
| * | | Update export button tooltipKushal Pandya2017-03-281-2/+4
| | | |
| * | | Add MR number to changelogKushal Pandya2017-03-281-1/+1
| | | |
| * | | Add changelog entryKushal Pandya2017-03-281-0/+4
| | | |
| * | | Fix project title validation, prevent clicking on disabled buttonKushal Pandya2017-03-281-9/+2
| | | |
* | | | Merge branch 'refactor_simulate_drag' into 'master' Clement Ho2017-04-0413-154/+148
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor test_utils bundle See merge request !10437
| * | | | Refactor test_utils bundleMike Greiling2017-04-0413-154/+148
|/ / / /
* | | | Merge branch '30451-fix-docs-check-jobs-shallow-fetch' into 'master' Achilleas Pipinellis2017-04-041-4/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fetch the default number of commits (20) for docs:check jobs Closes #30451 See merge request !10449
| * | | Fetch the default number of commits (20) for docs:check jobs30451-fix-docs-check-jobs-shallow-fetchRémy Coutable2017-04-041-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'bug/api_milestone_merge_requests_scope' into 'master' Rémy Coutable2017-04-045-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes milestone/merge_request API endpoint to really scope the results See merge request !10369
| * | | | Fixes milestone/merge_request API endpoint to really scope the resultsJoren De Groof2017-04-035-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | The MergeRequestsFinder uses the milestone_title instead of the milestone_id
* | | | | Merge branch 'fix/import-fork' into 'master' Rémy Coutable2017-04-0415-16/+215
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues importing forked projects Closes #26184 and #29380 See merge request !9102
| * | | | | Fix issues importing forked projectsJames Lopez2017-04-0415-16/+215
|/ / / / /
* | | | | Merge branch 'issue-boards-scrollbars' into 'master' Filipa Lacerda2017-04-041-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards having a vertical scrollbar Closes #30209 See merge request !10312
| * | | | | Fixed issue boards having a vertical scrollbarissue-boards-scrollbarsPhil Hughes2017-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes #30209
* | | | | | Merge branch '30400-fix-blob-highlighting-in-search' into 'master' Sean McGivern2017-04-045-4/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix blob highlighting in search Closes #30400 See merge request !10420
| * | | | | | Fix blob highlighting in searchNick Thomas2017-04-035-4/+35
| | | | | | |
* | | | | | | Merge branch 'workhorse-gitaly-address' into 'master' Sean McGivern2017-04-042-2/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Pass GitalyAddress to workhorse See merge request !10447
| * | | | | | Pass GitalyAddress to workhorseJacob Vosmaer2017-04-042-2/+9
| | | | | | |
* | | | | | | Merge branch 'environment-performance-improvements' into 'master' Filipa Lacerda2017-04-0410-153/+277
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved Environments Metrics UX Closes #29227 See merge request !9946
| * | | | | | | Removed formatRelevantDigits from text_utils.js and added it to a new file ↵environment-performance-improvementsJose Ivan Vargas2017-04-035-142/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number_utils.js Also improved code formatting
| * | | | | | | Code corrections with a helper and a variableJose Ivan Vargas2017-04-032-11/+10
| | | | | | | |
| * | | | | | | Added a formatRelevantDigits text utilityJose Ivan Vargas2017-04-034-14/+54
| | | | | | | |
| * | | | | | | Added CHANGELOGJose Ivan Vargas2017-04-031-0/+4
| | | | | | | |
View Lorry Controller Status