summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add leading comment space copissue_15557Felipe Artur2016-05-3113-53/+52
|
* Fix error 500 when sorting issues by milestone due date and filtering by labelsFelipe Artur2016-05-314-3/+30
|
* Merge branch 'fix/migration-uri-issue' into 'master' Robert Speicher2016-05-272-1/+2
|\ | | | | | | | | | | | | Fix import URL migration error Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17956 See merge request !4321
| * fix rescue block on migrationJames Lopez2016-05-272-1/+2
| |
* | Merge branch 'bendyorke-comment-fix' into 'master' Jacob Schatz2016-05-272-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update notes immediately after closing/reopening ## What does this MR do? Fixes MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4127 Thanks @bendyorke! ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? Constant conflicts in that MR ## What are the relevant issue numbers? ## Screenshots (if relevant) Fixes #15091 See merge request !4323
| * | Update notes immediately after closing/reopeningBen Yorke2016-05-272-4/+5
| |/
* | Merge branch 'calendar-activity-button-click' into 'master' Jacob Schatz2016-05-271-1/+1
|\ \ | |/ |/| | | | | | | | | Fixed issue with calendar activity button not sending request correctly When you click on a square it now sends the AJAX to the correct URL rather than the current URL. This was causing an issue where it would be loading the same page & inserting that into the DOM, rather than calendar activity events. See merge request !4322
| * Fixed issue with calendar activity button not sending request correctlyPhil Hughes2016-05-271-1/+1
|/
* Merge branch 'issuable-header-by-spacing' into 'master' Jacob Schatz2016-05-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with spacing in issuable header ## What does this MR do? Fixes an issue with spacing next to the word 'by' in the issuable header ## What are the relevant issue numbers? Closes #17864 ## Screenshots (if relevant) ![Screen_Shot_2016-05-27_at_11.53.37](/uploads/464c2149df304109726b7d7ab855ebe1/Screen_Shot_2016-05-27_at_11.53.37.png) See merge request !4314
| * Fixed issue with spacing in issuable headerissuable-header-by-spacingPhil Hughes2016-05-271-1/+1
| | | | | | | | | | | | The Ruby was returning the HTML without a spacing next to the word 'by' Closes #17864
* | Merge branch 'workhorse-0.7.4' into 'master' Yorick Peterse2016-05-272-2/+2
|\ \ | | | | | | | | | | | | Use gitlab-workhorse 0.7.4 See merge request !4317
| * | Use gitlab-workhorse 0.7.4Jacob Vosmaer2016-05-272-2/+2
| |/ | | | | | | | | This enables https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4278 .
* | Merge branch 'queue-time-changelog' into 'master' Yorick Peterse2016-05-271-0/+1
|\ \ | | | | | | | | | | | | Changelog entry for queue duration See merge request !4316
| * | Changelog entry for queue durationJacob Vosmaer2016-05-271-0/+1
| |/
* | Merge branch 'fix-multiple-ci-status-poll' into 'master' Jacob Schatz2016-05-272-2/+16
|\ \ | |/ |/| | | | | | | | | | | | | Fixed potential issue with 2 ci status polling events happening Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue. Also passed in the CI status as an option value rather than waiting for the first ajax request to finish See merge request !3869
| * Fixed potential issue with 2 ci status polling events happeningfix-multiple-ci-status-pollPhil Hughes2016-05-262-2/+16
| |
* | Merge branch 'fix-shortcuts-spec' into 'master' Jacob Schatz2016-05-271-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure project name is present on page ## What does this MR do? Fixes a failing spec See merge request !4307
| * | Ensure project name is present on pagefix-shortcuts-specAlfredo Sumaran2016-05-261-2/+2
| | |
* | | Merge branch 'filter-by-any-user' into 'master' Jacob Schatz2016-05-264-12/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter issuables by any user ![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif) Closes #2836 See merge request !3820
| * | | Fixed user select failing tests on merge requestfilter-by-any-userPhil Hughes2016-05-261-1/+1
| | | |
| * | | Filter issuables by any userPhil Hughes2016-05-264-12/+46
| | | | | | | | | | | | | | | | Closes #2836
* | | | Merge branch 'rs-remove-pending-spec' into 'master' Robert Speicher2016-05-261-5/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove boilerplate spec file for Ci::RunnerProject See merge request !4309
| * | | | Remove boilerplate spec file for Ci::RunnerProjectRobert Speicher2016-05-261-5/+0
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'fix/gitlab-importer-issue' into 'master' Robert Speicher2016-05-262-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab importer issue Fixed credentials not being called correctly - probably some bad refactoring or search & replace... Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565 See merge request !4301
| * | | | | added changelogfix/gitlab-importer-issueJames Lopez2016-05-261-0/+3
| | | | | |
| * | | | | fix bad refactoring of import data credentialsJames Lopez2016-05-261-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'scroll-links-bug' into 'master' Jacob Schatz2016-05-261-0/+21
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where fade div covers up controls button ## What does this MR do? Fixes bug where fade div covers up controls button ## Screenshots (if relevant) Before: <img src="/uploads/a6a883839255b8e10d872759a1aa54a0/Screen_Shot_2016-05-26_at_2.22.08_PM.png" width="300px"> After: <img src="/uploads/9ab53d9815470cf86f68f5a340ffc454/Screen_Shot_2016-05-26_at_2.22.42_PM.png" width="300px"> See merge request !4306
| * | | | Fix bug where fade div covers up controls buttonscroll-links-bugAnnabel Dunstone2016-05-261-0/+21
| | | | |
* | | | | Merge branch 'remove-unnecessary-titles' into 'master' Robert Speicher2016-05-2673-78/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove header title from project pages With new navigation design it makes no sense to duplicate title in the header. See merge request !4304
| * | | | Return header title for new project pageremove-unnecessary-titlesDmitriy Zaporozhets2016-05-261-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove header title from project pagesDmitriy Zaporozhets2016-05-2673-78/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With new navigation design it makes no sense to duplicate title in the header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'commit-header-buttons' into 'master' Jacob Schatz2016-05-264-38/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced number of buttons in commit header ## What does this MR do? Reduces the buttons in the commit header. ## What are the relevant issue numbers? Closes #17576 ## Screenshots ![Screen_Shot_2016-05-26_at_11.22.24](/uploads/b0d8535bbc02ae367f193dd6633bd022/Screen_Shot_2016-05-26_at_11.22.24.png) See merge request !4302
| * | | | | Improved mobile stylingcommit-header-buttonsPhil Hughes2016-05-262-14/+37
| | | | | |
| * | | | | Reduced number of buttons in commit headerPhil Hughes2016-05-264-26/+28
| | |/ / / | |/| | | | | | | | | | | | | Closes #17576
* | | | | Merge branch 'move-project-dropdown-async' into 'master' Jacob Schatz2016-05-265-9/+47
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loads move issue dropdown async To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns. ![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif) Closes #16563 See merge request !4160
| * | | | Updated Rubymove-project-dropdown-asyncPhil Hughes2016-05-251-2/+5
| | | | |
| * | | | Correctly sends project IDPhil Hughes2016-05-203-3/+3
| | | | |
| * | | | Fixed rubocop errorPhil Hughes2016-05-161-1/+0
| | | | |
| * | | | Updated testsPhil Hughes2016-05-161-5/+10
| | | | |
| * | | | Loads move issue dropdown asyncPhil Hughes2016-05-164-3/+34
| | | | | | | | | | | | | | | | | | | | Closes #16563
* | | | | Merge branch 'measure-proxy-timing' into 'master' Yorick Peterse2016-05-263-0/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Measure proxy flight time See merge request !4278
| * | | | | Rename metric to 'rails queue duration'Jacob Vosmaer2016-05-263-5/+5
| | | | | |
| * | | | | Test ProxyFlightTime middlewareJacob Vosmaer2016-05-251-0/+31
| | | | | |
| * | | | | Align class name with field nameJacob Vosmaer2016-05-252-2/+2
| | | | | |
| * | | | | Send data to InfluxDB instead of stdoutJacob Vosmaer2016-05-251-4/+6
| | | | | |
| * | | | | Couple ProxyTiming to Metrics middlewareJacob Vosmaer2016-05-252-1/+1
| | | | | |
| * | | | | Measure proxy timing: needs influxdb codeJacob Vosmaer2016-05-242-0/+23
| | | | | |
* | | | | | Merge branch 'services-ui' into 'master' Jacob Schatz2016-05-262-39/+45
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated services UI ![Screen_Shot_2016-05-17_at_10.38.10](/uploads/791ba27b3bbc18c9bde19ecf58ffea21/Screen_Shot_2016-05-17_at_10.38.10.png) See merge request !4177
| * | | | | Hide description on mobileservices-uiPhil Hughes2016-05-261-25/+24
| | | | | |
| * | | | | Updated services UIPhil Hughes2016-05-172-39/+46
| | | | | |
View Lorry Controller Status