summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Ensure project name is present on pagefix-shortcuts-specAlfredo Sumaran2016-05-261-2/+2
|
* Merge branch 'measure-proxy-timing' into 'master' Yorick Peterse2016-05-261-0/+31
|\ | | | | | | | | Measure proxy flight time See merge request !4278
| * Rename metric to 'rails queue duration'Jacob Vosmaer2016-05-261-2/+2
| |
| * Test ProxyFlightTime middlewareJacob Vosmaer2016-05-251-0/+31
| |
* | Merge branch 'remove-main-language' into 'master' Josh Frye2016-05-262-55/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove main_language and tests. Closes #14937 See merge request !4293
| * | Remove main_language and testsremove-main-languageJosh Frye2016-05-253-56/+1
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵sidebar-expand-collapseFatih Acet2016-05-265-5/+57
|\ \ \ | | | | | | | | | | | | sidebar-expand-collapse
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-265-3/+40
| |\ \ \
| | * | | Fix RuboCopRobert Speicher2016-05-251-1/+1
| | | | |
| | * | | New confirmation email :fire:Robert Speicher2016-05-251-1/+1
| | | | |
| | * | | Customize ActionMailer preview pathRobert Speicher2016-05-251-0/+11
| | | | |
| | * | | Merge branch 'improve-pipeline-design' into 'master' Douwe Maan2016-05-251-1/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve design of Pipeline view ## What does this MR do? Improves current design of Pipelines view when there is multiple stages. This makes the statuses clickable and makes the view more compact. ## Screenshots (if relevant) ![Screen_Shot_2016-05-21_at_01.20.40](/uploads/dd031b7af7005c7a61f3165fefa8b7c9/Screen_Shot_2016-05-21_at_01.20.40.png) cc @DouweM @markpundsack @rspeicher @marin See merge request !4230
| | | * | | Remove top block from builds pageimprove-pipeline-designAnnabel Dunstone2016-05-241-1/+0
| | | | |/ | | | |/|
| | * | | Merge branch 'issue_10725' into 'master' Douwe Maan2016-05-251-0/+27
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix forks creation when visibility level is restricted fixes #10725 See merge request !4283
| | | * | | Fix forks creation when visibility level is restrictedissue_10725Felipe Artur2016-05-251-0/+27
| | | | | |
| * | | | | Merge branch 'fix-issue-17496' into 'master' Douwe Maan2016-05-251-3/+18
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix groups API to list only user's accessible projects Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17496 See merge request !1966
| | * | | | Fix groups API to list only user's accessible projectsStan Hu2016-05-241-3/+18
| | | |_|/ | | |/| | | | | | | | | | | | Closes #17496
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-05-2564-115/+450
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | sidebar-expand-collapse
| * | | | Merge branch 'zero-project-creation-error-message' into 'master' Robert Speicher2016-05-251-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated error message when project limit is zero When the project limit is zero & the user tries to create a project, the error displayed is now 'Personal project creation is not allowed. Please contact your administrator with questions' Closes #17691 See merge request !4280
| | * | | Fixed project model testszero-project-creation-error-messagePhil Hughes2016-05-251-1/+1
| | |/ /
| * | | Merge branch 'issue-filter-name-options' into 'master' Jacob Schatz2016-05-251-0/+140
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issuable filtering improvements This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests. Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 See merge request !3699
| | * | | Updated Ruby based on feedbackissue-filter-name-optionsPhil Hughes2016-05-241-5/+5
| | | | |
| | * | | Fixed testsPhil Hughes2016-05-161-3/+2
| | | | |
| | * | | Fixed issue with not being able to sort and filterPhil Hughes2016-05-161-0/+35
| | | | |
| | * | | Added testsPhil Hughes2016-05-161-0/+106
| | | | |
| * | | | Switch the gitlab:db:configure task to use tables.any? instead of looking ↵DJ Mountney2016-05-251-3/+3
| | | | | | | | | | | | | | | | | | | | specifically for the schema_migrations table
| * | | | Add tests for the gitlab:db:configure rake taskDJ Mountney2016-05-251-0/+62
| | | | |
| * | | | Merge branch 'rs-rubocop-nottonot' into 'master' Dmitriy Zaporozhets2016-05-2556-105/+105
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Enable RSpec/NotToNot cop and auto-correct offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761 See merge request !4267
| | * | | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-2456-105/+105
| | | |/ | | |/| | | | | | | | | Also removes the note from the development/testing.md guide
| * | | Reduce spacingissue_15347Alfredo Sumaran2016-05-251-3/+3
| | | |
| * | | Address feedbackAlfredo Sumaran2016-05-252-84/+65
| | | | | | | | | | | | | | | | Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
| * | | Add tests for Todos target's stateAlfredo Sumaran2016-05-251-0/+84
| | | |
| * | | Merge branch 'issue_15221_2'Douwe Maan2016-05-251-0/+29
| |\ \ \
| | * | | Fix outer join when filtering milestonesissue_15221_2Felipe Artur2016-05-243-8/+10
| | | | |
| | * | | Fix bug when ordering by milestone due date and filtering by milestoneFelipe Artur2016-05-242-3/+0
| | | | |
| | * | | improve ordering sql for milestonesFelipe Artur2016-05-241-32/+21
| | | | |
| | * | | Fix ordering for MysqlFelipe Artur2016-05-243-9/+11
| | | | |
| | * | | Fix issues/MRs filter when ordering by milestone due dateFelipe Artur2016-05-241-1/+40
| | |/ /
| * | | Merge branch 'incremental-fixes' into 'master' Jacob Schatz2016-05-251-0/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix concurrent request when updating build log in browser If you have a slow internet connection the trace will not be updated correctly. We need to check if our request is the latest one. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17535 See merge request !4183
| | * | | Replace \n to <br>Kamil Trzcinski2016-05-231-0/+9
| | |/ /
| * | | Merge branch 'fix-registry-backups' into 'master' Douwe Maan2016-05-251-0/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix backups if registry is disabled Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17749 See merge request !4263
| | * | | Fix backups if registry is disabledKamil Trzcinski2016-05-231-0/+18
| | | | |
| * | | | Seconds plural slackAran Koning2016-05-241-4/+19
| | |/ / | |/| |
| * | | Merge branch 'master' into project-navigation-redesignDmitriy Zaporozhets2016-05-2381-277/+2699
| |\ \ \
| * | | | Fix spec for new project navigationDmitriy Zaporozhets2016-05-162-5/+2
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643Fatih Acet2016-05-23117-564/+3534
|\ \ \ \ | | |/ / | |/| | | | | | | | | | # Conflicts: # app/assets/stylesheets/pages/issuable.scss
| * | | Enable Style/SpaceAroundKeyword cop and fix offensesRobert Speicher2016-05-234-4/+4
| | | |
| * | | Merge branch 'fix-ci-charts-error-500' into 'master' Robert Speicher2016-05-231-0/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 in CI charts by gracefully handling commits with no durations ## What does this MR do? In the CI charts, this MR reports the duration of a commit to 0 if it is `nil`. ## Are there points in the code the reviewer needs to double check? Should we omit this commit from the chart or set it to some other value? ## Why was this MR needed? We were getting an Error 500 here: https://gitlab.com/gitlab-org/gitlab-ce/graphs/master/ci ## What are the relevant issue numbers? #17730 See merge request !4245
| | * | | Fix Error 500 in CI charts by gracefully handling commits with no durationsStan Hu2016-05-221-0/+7
| | | |/ | | |/| | | | | | | | | Closes #17730
| * | | Added due date testsPhil Hughes2016-05-231-0/+37
| |/ /
View Lorry Controller Status