summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-jsonStan Hu2017-09-184-3/+40
* Merge branch 'issue_37640' into 'master'Grzegorz Bizon2017-09-166-6/+67
|\
| * Merge branch 'master' into 'issue_37640'issue_37640Felipe Artur2017-09-15310-3656/+5781
| |\
| * | Add data migrationFelipe Artur2017-09-153-2/+35
| * | Fix project feature being deleted when updating project with invalid visibili...Felipe Artur2017-09-125-5/+33
* | | Merge branch 'rs-default-user-entity' into 'master'Stan Hu2017-09-161-1/+1
|\ \ \ | |_|/ |/| |
| * | Ensure we use `Entities::User` for non-admin `users/:id` API requestsRobert Speicher2017-09-151-1/+1
|/ /
* | Merge branch 'grpc-1.6' into 'master'Robert Speicher2017-09-151-1/+1
|\ \
| * | Use grpc 1.6.0grpc-1.6Jacob Vosmaer2017-09-141-1/+1
* | | Merge branch 'fix-share-with-group-lock-update' into 'master'Robert Speicher2017-09-154-4/+51
|\ \ \
| * | | Fix setting share_with_group_lockfix-share-with-group-lock-updateYorick Peterse2017-09-154-4/+51
* | | | Merge branch '35917_create_services_for_keys' into 'master'Rémy Coutable2017-09-1518-49/+103
|\ \ \ \
| * | | | created services for keyshaseeb2017-09-1518-49/+103
|/ / / /
* | | | Merge branch '21331-improve-confusing-compare-page' into 'master'Phil Hughes2017-09-155-17/+28
|\ \ \ \
| * | | | Make the labels in the Compare form less confusing21331-improve-confusing-compare-pageRémy Coutable2017-09-155-17/+28
| |/ / /
* | | | Merge branch 'projects-controller-show' into 'master'Rémy Coutable2017-09-157-16/+121
|\ \ \ \
| * | | | Memoize the latest builds of a pipelineprojects-controller-showYorick Peterse2017-09-144-15/+42
| * | | | Memoize pipelines for project download buttonsYorick Peterse2017-09-144-1/+79
* | | | | Merge branch 'winh-protected-branch-modal-merged' into 'master'36436-repo-button-back-button-not-consistentPhil Hughes2017-09-154-5/+20
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Display whether branch has been merged when deleting protected branchWinnie Hellmann2017-09-154-5/+20
|/ / / /
* | | | Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-157-48/+39
|\ \ \ \
| * | | | fixed merge request specrevert-sidebar-title-attributePhil Hughes2017-09-131-1/+1
| * | | | Remove title attribute from sidebar elementsPhil Hughes2017-09-136-47/+38
* | | | | Merge branch 'docs/environment-vars-clarify' into 'master'Rémy Coutable2017-09-153-57/+69
|\ \ \ \ \
| * | | | | Clarify what variables can be used under `environment:`docs/environment-vars-clarifyAchilleas Pipinellis2017-09-143-57/+69
* | | | | | Merge branch '20824-scope-users-to-members-in-group-issuable-list' into 'master'Phil Hughes2017-09-157-2/+57
|\ \ \ \ \ \
| * | | | | | Return only group's members in user dropdowns on issuables list pages20824-scope-users-to-members-in-group-issuable-listRémy Coutable2017-09-146-0/+55
| * | | | | | Scope users by group in issuable search barbarthc2017-09-131-2/+2
* | | | | | | Merge branch '37844-layout-nav-space' into 'master'Phil Hughes2017-09-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove extra space between profile header and navbar37844-layout-nav-spaceAnnabel Dunstone Gray2017-09-141-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '37886-typo-in-protected-runners-setting-checkbox' into 'master'Grzegorz Bizon2017-09-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo37886-typo-in-protected-runners-setting-checkboxFabio Busatto2017-09-141-1/+1
* | | | | | | | Merge branch 'patch-26' into 'master'Stan Hu2017-09-151-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | add info about UX label to feature proposal to CONTRIBUTING.mdSarrah Vesselov2017-09-141-1/+4
* | | | | | | | | Merge branch '37896-minor-improvements-to-prometheus-docs' into 'master'Achilleas Pipinellis2017-09-152-3/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | update screenshot37896-minor-improvements-to-prometheus-docsJoshua Lambert2017-09-151-0/+0
| * | | | | | | | fix minor typoJoshua Lambert2017-09-151-3/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'indexes-for-recent-push-events' into 'master'Robert Speicher2017-09-142-2/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing index for getting recent push eventsindexes-for-recent-push-eventsYorick Peterse2017-09-142-2/+42
* | | | | | | | | Merge branch 'changes-overflow-fix' into 'master'Annabel Dunstone Gray2017-09-142-3/+11
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed overflow issue in changes dropdownchanges-overflow-fixPhil Hughes2017-09-132-3/+11
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '37872-fix-nasty-gdk-nuke' into 'master'Robert Speicher2017-09-142-37/+51
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Make TestInit.setup_gitlab_shell and TestInit.setup_gitaly more robust37872-fix-nasty-gdk-nukeRémy Coutable2017-09-141-36/+45
| * | | | | | | Abort when `TestEnv.init` is not called in the `test` environmentRémy Coutable2017-09-141-0/+5
| * | | | | | | Force `RAILS_ENV` to `test` in `spec/spec_helper.rb`Rémy Coutable2017-09-141-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'docs-my-reaction-filter' into 'master'Achilleas Pipinellis2017-09-141-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Docs filter by my reactionVictor Wu2017-09-141-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'ci-environment-status-performance' into 'master'Stan Hu2017-09-145-3/+32
|\ \ \ \ \ \ \
| * | | | | | | Disallow NULL values for environments.project_idci-environment-status-performanceYorick Peterse2017-09-133-2/+23
| * | | | | | | Constrain environment deployments to project IDsYorick Peterse2017-09-132-1/+9
| | |_|_|/ / / | |/| | | | |