summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into experimental-breadcrumbsexperimental-breadcrumbsPhil Hughes2017-06-30356-5078/+13222
|\
| * Merge branch '34461-top-banner-job-master' into 'master'Phil Hughes2017-06-301-5/+5
| |\
| | * Only verifies top position after the request has finished to account for errorsFilipa Lacerda2017-06-301-5/+5
| |/
| * Merge branch 'dz-improve-codeclimate-json-cleanup' into 'master'Kamil Trzciński2017-06-301-2/+3
| |\
| | * Fix codeclimate job in .gitlab-ci.ymlDmitriy Zaporozhets2017-06-291-1/+1
| | * Cleanup codeclimate.json file generated by CIDmitriy Zaporozhets2017-06-291-2/+3
| * | Merge branch 'dm-empty-state-new-merge-request' into 'master'Sean McGivern2017-06-302-3/+10
| |\ \
| | * | Fix 'New merge request' button for users who don't have push access to canoni...dm-empty-state-new-merge-requestDouwe Maan2017-06-292-3/+10
| * | | Merge branch '34502-gitlab-git-hook-should-set-the-gl_repository-environment-...Dmitriy Zaporozhets2017-06-308-33/+47
| |\ \ \
| | * | | Set the GL_REPOSITORY env variable on Gitlab::Git::Hook34502-gitlab-git-hook-should-set-the-gl_repository-environment-variableAlejandro Rodríguez2017-06-298-33/+47
| * | | | Merge branch 'update_issues_board_doc' into 'master'Achilleas Pipinellis2017-06-304-0/+0
| |\ \ \ \
| | * | | | updated version of issues baord images (doc)Diego de Souza Mendes2017-06-294-0/+0
| * | | | | Merge branch 'inject-add-diff-note' into 'master'Phil Hughes2017-06-3012-154/+105
| |\ \ \ \ \
| | * | | | | Render add-diff-note button with server.Bryce Johnson2017-06-2912-154/+105
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'Tim Zallmann2017-06-305-15/+46
| |\ \ \ \ \
| | * | | | | Refactored tests and added a breakpoint to the merge_request_tabsfix-sidebar-showing-mobile-merge-requestsJose Ivan Vargas2017-06-294-17/+42
| | * | | | | Fixed sidebar not collapsing on merge request in mobile screensJose Ivan Vargas2017-06-273-3/+9
| * | | | | | Merge branch 'backport-license-issue-weights' into 'master'Douwe Maan2017-06-292-5/+19
| |\ \ \ \ \ \
| | * | | | | | Backport changes to Projects::IssuesController and the search barNick Thomas2017-06-292-5/+19
| * | | | | | | Merge branch 'bugfix/declarative-policy-reloading' into 'master'Douwe Maan2017-06-293-3/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloadinghttp://jneen.net/2017-06-293-3/+3
| |/ / / / / /
| * | | | | | Merge branch '34349-select-branch-dropdown-is-too-close-to-branch-name' into ...34532-hot-code-reloading-in-development-is-broken-by-new-declarative-policiesAnnabel Dunstone Gray2017-06-292-18/+25
| |\ \ \ \ \ \
| | * | | | | | Resolve "Select branch dropdown is too close to branch name"Tim Zallmann2017-06-292-18/+25
| |/ / / / / /
| * | | | | | Merge branch 'rs-silence-update-pages-service' into 'master'Rémy Coutable2017-06-291-1/+2
| |\ \ \ \ \ \
| | * | | | | | Perform unzip quietly in UpdatePagesServicers-silence-update-pages-serviceRobert Speicher2017-06-281-1/+2
| * | | | | | | Merge branch 'new-nav-logo-safari-fix' into 'master'Annabel Dunstone Gray2017-06-291-3/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed new navgiation bar logo height in SafariPhil Hughes2017-06-291-3/+2
| * | | | | | | | Merge branch '34407-flickering-scroll-v1' into 'master'Annabel Dunstone Gray2017-06-291-3/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix scroll flicker34407-flickering-scroll-v1Eric Eastwood2017-06-281-3/+5
| * | | | | | | | | Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'Robert Speicher2017-06-295-22/+54
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Defer project destroys within a namespace in Groups::DestroyService#async_exe...Stan Hu2017-06-295-22/+54
| * | | | | | | | | | Merge branch 'issueable-list-cleanup' into 'master'Annabel Dunstone Gray2017-06-298-74/+145
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Clean up issuable listsTaurie Davis2017-06-298-74/+145
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '33443_supplement_traditional_chinese_in_taiwan_translation' int...Douwe Maan2017-06-292-86/+883
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | rebase to master黄涛2017-06-290-0/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | optimize translation content based on comments黄涛2017-06-291-20/+20
| | | * | | | | | | | supplement traditional chinese in taiwan translation黄涛2017-06-282-86/+883
| | * | | | | | | | | optimize translation content based on comments黄涛2017-06-291-20/+20
| | * | | | | | | | | supplement traditional chinese in taiwan translation黄涛2017-06-292-86/+883
| * | | | | | | | | | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into...Robert Speicher2017-06-298-33/+241
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Rename flipper_group to feature_group34078-allow-to-enable-feature-flags-with-more-granularityRémy Coutable2017-06-283-12/+12
| | * | | | | | | | | Add MR iid in CHANGELOG entryRémy Coutable2017-06-281-1/+1
| | * | | | | | | | | Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ...Rémy Coutable2017-06-276-16/+24
| | * | | | | | | | | Allow the feature flags to be enabled/disabled with more granularityRémy Coutable2017-06-278-33/+233
| * | | | | | | | | | Merge branch '34403-issue-dropdown-persists-when-adding-issue-number-to-issue...Phil Hughes2017-06-294-1/+22
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Resolve "Issue dropdown persists when adding issue number to issue description"Tim Zallmann2017-06-294-1/+22
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'jej/run-mysql-tests-on-stable-preparation-branches' into 'master'Rémy Coutable2017-06-291-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Run mysql tests on stable preperation branches like 9-3-stable-patch-2jej/run-mysql-tests-on-stable-preparation-branchesJames Edwards-Jones2017-06-291-1/+1
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-296-0/+149
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added code for defining SHA attributesYorick Peterse2017-06-296-0/+149