summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '52771-ldap-users-can-t-choose-private-or-internal-when-creating...11-5-stable-prepare-rc3Dmitriy Zaporozhets2018-11-073-2/+27
* Update VERSION to 11.5.0-rc2v11.5.0-rc2GitLab Release Tools Bot2018-11-071-1/+1
* Merge branch '11-5-stable-prepare-rc2' into '11-5-stable'Steve Azzopardi2018-11-063-58/+32
|\
| * Merge branch 'revert-drop-gcp-clusters-table' into 'master'Steve Azzopardi2018-11-063-58/+32
|/
* Update VERSION to 11.5.0-rc1v11.5.0-rc1GitLab Release Tools Bot2018-11-021-1/+1
* Merge branch 'sh-optimize-reload-diffs-service' into 'master'Sean McGivern2018-11-026-11/+33
|\
| * Fix merge request specs that expect diff_files to be calledsh-optimize-reload-diffs-serviceStan Hu2018-11-012-8/+8
| * Avoidp loading merge request diff files when not neededStan Hu2018-11-012-3/+6
| * Significantly cut memory usage and SQL queries when reloading diffsStan Hu2018-11-013-1/+20
* | Merge branch '52548-links-in-tabs-of-the-labels-index-pages-ends-with-html' i...Sean McGivern2018-11-023-1/+31
|\ \
| * | Fix typo in labels_helper_spec.rb52548-links-in-tabs-of-the-labels-index-pages-ends-with-htmlDmitriy Zaporozhets2018-11-011-1/+1
| * | Fix bug when links in tabs of the labels index pages ends with .htmlDmitriy Zaporozhets2018-10-313-1/+31
* | | Merge branch 'ab-45608-stuck-mr-query' into 'master'Sean McGivern2018-11-023-1/+23
|\ \ \
| * | | Add index to find stuck merge requests.ab-45608-stuck-mr-queryAndreas Brandl2018-11-013-1/+23
* | | | Merge branch 'gl-ui-progress-bar' into 'master'Phil Hughes2018-11-023-2/+10
|\ \ \ \
| * | | | Remove gitlab-ui's progress bar from globalClement Ho2018-11-023-2/+10
|/ / / /
* | | | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-11-02456-3331/+4717
|\ \ \ \
| * \ \ \ Merge branch 'kinolaev-master-patch-91872' into 'master'Dmitriy Zaporozhets2018-11-022-1/+6
| |\ \ \ \
| | * | | | Change HELM_HOST in Auto-DevOps to work behind proxySergej2018-11-012-1/+6
| * | | | | Merge branch 'sh-link-bitbucket-server-import-docs' into 'master'Evan Read2018-11-011-1/+2
| |\ \ \ \ \
| | * | | | | Link Bitbucket Server from import index pagesh-link-bitbucket-server-import-docsStan Hu2018-11-011-1/+2
| * | | | | | Merge branch 'sh-fix-generators-not-always-working' into 'master'Robert Speicher2018-11-011-1/+5
| |\ \ \ \ \ \
| | * | | | | | Fix "rails g migration" not always using migration templatessh-fix-generators-not-always-workingStan Hu2018-10-251-1/+5
| * | | | | | | Merge branch 'replace-tooltip-in-markdown-component' into 'master'Clement Ho2018-11-013-10/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Replace tooltip in markdown component with gl-tooltipGeorge Tsiolis2018-10-313-10/+15
| * | | | | | | | Merge branch 'user-model-merge-conflicts' into 'master'Robert Speicher2018-11-012-2/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use a method for the has_many :keys in Projectuser-model-merge-conflictsYorick Peterse2018-11-012-1/+5
| | * | | | | | | | Move LDAP sync time constant to a methodYorick Peterse2018-11-011-1/+6
| * | | | | | | | | Merge branch 'sh-bump-puma-memory-limits' into 'master'Robert Speicher2018-11-011-1/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Reserve more RAM for master process in Pumash-bump-puma-memory-limitsStan Hu2018-11-011-1/+5
| * | | | | | | | | | Merge branch 'fix-for-assets-image' into 'master'Stan Hu2018-11-011-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Use CI_COMMIT_REF_SLUG when building assets imagefix-for-assets-imageIan Baum2018-11-011-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'ee-8121-geo-search-bar' into 'master'Douglas Barbosa Alexandre2018-11-011-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add render_if_exists to inject additional search field in EEGabriel Mazetto2018-11-011-0/+2
| * | | | | | | | | | | Merge branch 'db-schema-merge-conflicts' into 'master'Robert Speicher2018-11-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Use merge_db_schema for db/schema.rb conflictsdb-schema-merge-conflictsYorick Peterse2018-11-011-0/+1
| * | | | | | | | | | | Merge branch 'winh-job-list-dynamic-timer' into 'master'Clement Ho2018-11-013-3/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add dynamic timer for delayed jobs in job listwinh-job-list-dynamic-timerWinnie Hellmann2018-11-013-3/+24
| * | | | | | | | | | | Merge branch 'related_mrs' into 'master'Douglas Barbosa Alexandre2018-11-014-0/+184
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | add related merge request endpointHelmut Januschka2018-11-014-0/+184
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'patch-31' into 'master'Achilleas Pipinellis2018-11-011-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixes automatic URL formattingLyle Kozloff2018-10-311-2/+2
| * | | | | | | | | | | Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'Sean McGivern2018-11-0112-28/+142
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix testsHeinrich Lee Yu2018-11-016-33/+40
| | * | | | | | | | | | Add changelog entryHeinrich Lee Yu2018-11-011-0/+5
| | * | | | | | | | | | Add testsHeinrich Lee Yu2018-11-013-4/+46
| | * | | | | | | | | | Add documentationHeinrich Lee Yu2018-11-012-17/+17
| | * | | | | | | | | | Add None / Any options to search barHeinrich Lee Yu2018-11-012-0/+18
| | * | | | | | | | | | Add None / Any options to reaction filter in issues / MRs APIHeinrich Lee Yu2018-11-012-10/+52
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'docs/fix-user-training' into 'master'Achilleas Pipinellis2018-11-011-136/+131
| |\ \ \ \ \ \ \ \ \ \