summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* updated specfix/fogbugz-importJames Lopez2016-03-311-1/+1
* spec and fix for fogbugz lonely user problemJames Lopez2016-03-302-1/+25
* Merge branch 'patch/fix-mergerequest-diff' into 'master' Robert Speicher2016-03-304-7/+8
|\
| * Fixed MergeRequestController specpatch/fix-mergerequest-diffGabriel Mazetto2016-03-302-2/+3
| * We need `sha` reference from `diff_base_commit` to generate the diffGabriel Mazetto2016-03-291-2/+2
| * Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-292-6/+6
* | Merge branch 'refactor/project-badges-interface' into 'master' Robert Speicher2016-03-303-2/+99
|\ \
| * | Extend specs for build badgerefactor/project-badges-interfaceGrzegorz Bizon2016-03-291-9/+48
| * | Refactor builds badge, encapsulate inside a classGrzegorz Bizon2016-03-293-2/+60
* | | Add 8.6.2 CHANGELOG itemsRémy Coutable2016-03-301-4/+22
* | | Merge branch 'functional-closed-sidebar' into 'master' Dmitriy Zaporozhets2016-03-309-26/+116
|\ \ \
| * | | Remove console logsJacob Schatz2016-03-301-1/+0
| * | | Off the event initiallyJacob Schatz2016-03-301-1/+2
| * | | Collapsed sidebar opens over instead of pushing content.Jacob Schatz2016-03-302-1/+7
| * | | Sidebar collapse update issueJacob Schatz2016-03-307-18/+71
| * | | User selection from collapsed sidebarJacob Schatz2016-03-301-0/+17
| * | | Add json response for user avatar in merge requestJacob Schatz2016-03-301-1/+1
| * | | Make changed values visible in minimized sidebar.Jacob Schatz2016-03-303-25/+39
|/ / /
* | | Merge branch 'notification-settings-save' into 'master' Rémy Coutable2016-03-301-16/+17
|\ \ \
| * | | Fixed issue with notification settings not savingPhil Hughes2016-03-301-16/+17
|/ / /
* | | Merge branch 'rs-banzai-requires' into 'master' Rémy Coutable2016-03-3018-38/+0
|\ \ \
| * | | Remove redundant `require`s from Banzai filesrs-banzai-requiresRobert Speicher2016-03-2418-38/+0
* | | | Merge branch 'added-milestone-upcoming' into 'master' Rémy Coutable2016-03-3012-59/+139
|\ \ \ \ | |_|_|/ |/| | |
| * | | Spec updatesadded-milestone-upcomingPhil Hughes2016-03-292-8/+6
| * | | Updated based on Ruby feedbackPhil Hughes2016-03-294-6/+6
| * | | Ruby fixesPhil Hughes2016-03-292-12/+5
| * | | Fixed multiselectPhil Hughes2016-03-292-28/+6
| * | | Fixed rubocop issuesPhil Hughes2016-03-291-5/+6
| * | | Fixed issue with milestone not being un-selectablePhil Hughes2016-03-291-0/+2
| * | | Standardised the output of the JSON to always include the namePhil Hughes2016-03-296-14/+31
| * | | Removed un-used codePhil Hughes2016-03-291-11/+0
| * | | Updated to only include upcoming on filtersPhil Hughes2016-03-292-3/+24
| * | | Added tests for upcoming milestone filterPhil Hughes2016-03-292-0/+68
| * | | Dropdown bug fixesPhil Hughes2016-03-296-23/+36
* | | | Merge branch 'fix-mr-comment-commit-pruned' into 'master' Robert Speicher2016-03-293-4/+10
|\ \ \ \
| * | | | Gracefully handle notes on deleted commits in merge requestsStan Hu2016-03-283-4/+10
* | | | | Merge branch 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description'...Robert Speicher2016-03-295-44/+83
|\ \ \ \ \
| * | | | | api - expose label descriptionMariusz Jachimowicz2016-03-245-44/+83
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix_wip_in_mr_api' into 'master' Robert Speicher2016-03-293-5/+16
|\ \ \ \ \
| * | | | | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-283-5/+16
* | | | | | Merge branch 'handle-nil-description-slack-message' into 'master' Robert Speicher2016-03-293-1/+12
|\ \ \ \ \ \
| * | | | | | Handle nil descriptions in Slack issue messagesStan Hu2016-03-283-1/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'gitlab-shell-2.7' into 'master' Robert Speicher2016-03-291-1/+1
|\ \ \ \ \ \
| * | | | | | Updated gitlab-shell to 2.7gitlab-shell-2.7Yorick Peterse2016-03-291-1/+1
|/ / / / / /
* | | | | | Merge branch 'rs-fix-migrations' into 'master' Dmitriy Zaporozhets2016-03-295-34/+54
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use raw SQL instead of Rails models in migrations where appropriaters-fix-migrationsRobert Speicher2016-03-285-34/+54
* | | | | | Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master' Rémy Coutable2016-03-291-21/+21
|\ \ \ \ \ \
| * | | | | | Fix order of steps to prevent PostgreSQL errors when running migration [ci skip]doc-update-8.5-to-8.6-fix-steps-orderRodrigo Manhães2016-03-221-21/+21
* | | | | | | Merge branch 'fix/nomethod-error-on-ci' into 'master' Rémy Coutable2016-03-294-21/+31
|\ \ \ \ \ \ \
| * | | | | | | Redirect to root path when visiting `/ci`fix/nomethod-error-on-ciGrzegorz Bizon2016-03-293-25/+20
View Lorry Controller Status