summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-305-7/+6
* Merge branch 'feature/note-validator' into 'master' Robert Speicher2016-05-3022-156/+299
|\
| * Shut up, RuboCopfeature/note-validatorRobert Speicher2016-05-291-2/+2
| * 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
| * 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 wherever is possible for .gitignore entries.Ruben Davila2016-05-291-38/+38
| * Ignore files under "/shared" directory and not other subdirectories that cont...Ruben Davila2016-05-291-1/+1
|/
* Merge branch 'consistent-snippet-prefix' into 'master' Jacob Schatz2016-05-281-1/+1
|\
| * 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 404zj-race-condition-pending-deleteZeger-Jan van de Weg2016-05-283-1/+13
|/
* Merge branch 'fix/migration-uri-issue' into 'master' Robert Speicher2016-05-272-1/+2
|\
| * 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/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 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 headerissuable-header-by-spacingPhil Hughes2016-05-271-1/+1
* | Merge branch 'workhorse-0.7.4' into 'master' Yorick Peterse2016-05-272-2/+2
|\ \
| * | Use gitlab-workhorse 0.7.4Jacob Vosmaer2016-05-272-2/+2
| |/
* | Merge branch 'queue-time-changelog' into 'master' Yorick Peterse2016-05-271-0/+1
|\ \
| * | 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 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 pagefix-shortcuts-specAlfredo Sumaran2016-05-261-2/+2
* | | Merge branch 'filter-by-any-user' into 'master' Jacob Schatz2016-05-264-12/+46
|\ \ \
| * | | 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
* | | | Merge branch 'rs-remove-pending-spec' into 'master' Robert Speicher2016-05-261-5/+0
|\ \ \ \
| * | | | Remove boilerplate spec file for Ci::RunnerProjectRobert Speicher2016-05-261-5/+0
* | | | | Merge branch 'fix/gitlab-importer-issue' into 'master' Robert Speicher2016-05-262-3/+6
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | |