summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1Takuya Noguchi2017-08-015-314/+383
* Merge branch 'fix-group-milestone-link-in-issuable-sidebar' into 'master'Robert Speicher2017-07-315-13/+62
|\
| * Fix group milestone path on issuable sidebarfix-group-milestone-link-in-issuable-sidebarSean McGivern2017-07-315-13/+62
* | Merge branch 'winh-repository-dropdown-style' into 'master'Annabel Dunstone Gray2017-07-311-0/+22
|\ \
| * | Make dropdown style on repository page consistentwinh-repository-dropdown-stylewinh2017-07-311-0/+22
* | | Merge branch 'winh-newnav-projects-dropdown-style' into 'master'Annabel Dunstone Gray2017-07-311-0/+19
|\ \ \
| * | | Make projects dropdown style in new navigation consistentwinh-newnav-projects-dropdown-stylewinh2017-07-311-0/+19
* | | | Merge branch 'winh-user-dropdown-style' into 'master'Annabel Dunstone Gray2017-07-311-0/+19
|\ \ \ \
| * | | | Make header dropdown styles consistentwinh-user-dropdown-stylewinh2017-07-261-0/+19
* | | | | Merge branch 'mk-fix-wiki-backup' into 'master'Douwe Maan2017-07-313-0/+59
|\ \ \ \ \
| * | | | | Fix Rubocop offensemk-fix-wiki-backupMichael Kozono2017-07-281-4/+4
| * | | | | Add changelogMichael Kozono2017-07-281-0/+4
| * | | | | Protect backups from stale cache for repo existsMichael Kozono2017-07-282-0/+55
* | | | | | Merge branch 'avoid-expect_any_instance_of' into 'master'Rémy Coutable2017-07-311-9/+13
|\ \ \ \ \ \
| * | | | | | Avoid expect_any_instance_of because it doesn't workavoid-expect_any_instance_ofLin Jen-Shin2017-07-311-9/+13
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master'Kamil Trzciński2017-07-317-53/+94
|\ \ \ \ \ \
| * | | | | | Improve wording related to deploy chatops commandfix/gb/fix-chatops-deploy-multiple-actions-matchingGrzegorz Bizon2017-07-285-7/+7
| * | | | | | Update docs regarding deploy chatops slash commandGrzegorz Bizon2017-07-281-1/+20
| * | | | | | Add changelog entry for deploy chatops command fixGrzegorz Bizon2017-07-281-0/+4
| * | | | | | Improve deploy environment chatops slash commandGrzegorz Bizon2017-07-284-51/+69
* | | | | | | Merge branch 'add-regressions-explanation' into 'master'Douwe Maan2017-07-311-1/+19
|\ \ \ \ \ \ \
| * | | | | | | Explain what the regression label meansadd-regressions-explanationSean McGivern2017-07-311-1/+19
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '29385/add_shrug_command' into 'master'Rémy Coutable2017-07-319-7/+225
|\ \ \ \ \ \ \
| * | | | | | | Fixes #29385: Add /shrug and /tableflip commandsAlex Ives2017-07-289-7/+225
* | | | | | | | Merge branch '35482-dropdown' into 'master'Annabel Dunstone Gray2017-07-311-4/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | fix :focus styles for selected filter dropdown items35482-dropdownSimon Knox2017-07-251-4/+4
* | | | | | | | Merge branch 'win-newnav-badges-firefox' into 'master'Phil Hughes2017-07-312-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix badge positioning in new navigation for Firefoxwin-newnav-badges-firefoxwinh2017-07-312-3/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '34679-enhance-pt-br' into 'master'Rémy Coutable2017-07-311-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Enhance pt-BR translation in Project and Repository pagesPaulo Bezerra2017-07-251-7/+7
* | | | | | | | | Merge branch 'rs-deduplicate-notification-service-spec' into 'master'Rémy Coutable2017-07-311-37/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | De-duplicate two specs in spec/services/notification_service_specrs-deduplicate-notification-service-specRobert Speicher2017-07-281-37/+10
* | | | | | | | | | Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'Sean McGivern2017-07-312-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptordm-ldap-authentication-ssl-verificationDouwe Maan2017-07-312-1/+5
* | | | | | | | | | | Merge branch 'breadcrumbs-collapsed-title-width-fix' into 'master'Filipa Lacerda2017-07-312-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed breadcrumb titles aggressively collapsingbreadcrumbs-collapsed-title-width-fixPhil Hughes2017-07-282-1/+6
* | | | | | | | | | | | Merge branch 'docs-new-topic-user-project-index' into 'master'Job van der Voort2017-07-316-10/+118
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | New doc topic user/project/indexMarcia Ramos2017-07-316-10/+118
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'cherry-pick-41db362c' into 'master'Rémy Coutable2017-07-311-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'cherry-pick-41db362cRémy Coutable2017-07-281-1/+3
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'inline-js-removal-projects-other' into 'master'Phil Hughes2017-07-3113-113/+140
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Moved the duplicate Available Refs to a default in RefSelectDropdowninline-js-removal-projects-otherTim Zallmann2017-07-282-3/+4
| * | | | | | | | | | | Updated Event Handlers based on MR discussionTim Zallmann2017-07-281-8/+8
| * | | | | | | | | | | Left a bracket in the line :-/Tim Zallmann2017-07-271-1/+1
| * | | | | | | | | | | Fixed the strange escapingTim Zallmann2017-07-271-1/+1
| * | | | | | | | | | | Maybe that fixes the escaping in the URLTim Zallmann2017-07-271-1/+1
| * | | | | | | | | | | Revert "Due to more async loading the tests could fail, trying to fix it with...Tim Zallmann2017-07-271-4/+0
| * | | | | | | | | | | Due to more async loading the tests could fail, trying to fix it with wait_fo...Tim Zallmann2017-07-271-0/+4
| * | | | | | | | | | | Fixes New Project BugTim Zallmann2017-07-273-5/+5
| * | | | | | | | | | | Converted Pipelines ChartsTim Zallmann2017-07-274-50/+47