summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable Style/IndentAssignment Rubocop style copstyle/enable-rubocop-indent-assignment-copGrzegorz Bizon2016-05-302-8/+8
| | | | See #17478
* Merge branch 'feature/note-validator' into 'master' Robert Speicher2016-05-3022-156/+299
|\ | | | | | | | | | | | | | | | | Improve note validation This MR improves note validation. Originates from #15577. Closes #17260 See merge request !4024
| * Shut up, RuboCopfeature/note-validatorRobert Speicher2016-05-291-2/+2
| | | | | | | | :heart:
| * Move Changelog entry for note validation to 8.9Grzegorz Bizon2016-05-291-1/+1
| |
| * Improve note factoryGrzegorz Bizon2016-05-296-21/+19
| |
| * Improve notes factoryGrzegorz Bizon2016-05-291-4/+1
| |
| * Add Changelog entry for note validation improvementsGrzegorz Bizon2016-05-291-0/+1
| |
| * Minor changes in note validation specsGrzegorz Bizon2016-05-294-19/+22
| |
| * Validate presence of noteable_type in note modelGrzegorz Bizon2016-05-291-0/+1
| |
| * Update specs to carry out changes in note factoryGrzegorz Bizon2016-05-2916-131/+259
| |
| * Do not override foreign attributes in note factoryGrzegorz Bizon2016-05-292-6/+5
| |
| * Add more validation tests for note modelGrzegorz Bizon2016-05-291-0/+27
| |
| * Remove redundant `with_options` from note validatorsGrzegorz Bizon2016-05-291-5/+3
| |
| * Update note factory to include noteable associationGrzegorz Bizon2016-05-292-15/+9
| |
| * Improve note validation for project mismatchGrzegorz Bizon2016-05-291-5/+7
| |
| * Make note invalid if noteable project is differentGrzegorz Bizon2016-05-291-0/+6
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577
| * Remove reduntant note validation from create serviceGrzegorz Bizon2016-05-291-11/+0
| |
| * Update specs for creating new note without accessGrzegorz Bizon2016-05-291-2/+2
| |
* | Merge branch 'update_gitignore' into 'master' Robert Speicher2016-05-291-39/+39
|\ \ | |/ |/| | | | | Use absolute paths in .gitignore See merge request !4335
| * Use absolute paths wherever is possible for .gitignore entries.Ruben Davila2016-05-291-38/+38
| |
| * Ignore files under "/shared" directory and not other subdirectories that ↵Ruben Davila2016-05-291-1/+1
|/ | | | | | | contains that name It's working fine now but by making it more explicit we can make tools like 'The Silver Searcher' to parse properly the .gitignore file
* Merge branch 'consistent-snippet-prefix' into 'master' Jacob Schatz2016-05-281-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Use $ as the snippet prefix so it's consistent ## What does this MR do? Change like `Snippet #20073` to `Snippet $20073` ## Are there points in the code the reviewer needs to double check? Are there any other places need this change? See merge request !4338
| * Use $ as the snippet prefix so it's consistentLin Jen-Shin2016-05-281-1/+1
|/
* Merge branch 'zj-race-condition-pending-delete' into 'master' Stan Hu2016-05-283-1/+13
|\ | | | | | | | | | | | | Project#show on projects pending deletion will 404 fixes #17508 See merge request !4156
| * Project#show on projects pending deletion will 404zj-race-condition-pending-deleteZeger-Jan van de Weg2016-05-283-1/+13
|/ | | | fixes #17508
* 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
View Lorry Controller Status