summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add lower path index to redirect_routesmk-add-lower-path-index-to-redirect-routesMichael Kozono2017-07-254-1/+41
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceTim Zallmann2017-07-241-0/+49
|\
| * Merge branch 'enhance-backend-review-guide' into 'master'Rémy Coutable2017-07-241-0/+49
| |\
| | * Add GitLab-specific concerns to code review guideSean McGivern2017-07-241-0/+49
* | | How to Merge to external FileTim Zallmann2017-07-243-11/+16
|/ /
* | Merge branch 'dz-fix-calendar-today' into 'master'Phil Hughes2017-07-242-1/+5
|\ \
| * | Fix today day highlight in calendarDmitriy Zaporozhets2017-07-242-1/+5
* | | Merge branch 'fix/use-another-gitaly-feature-name-for-workhorse-send-blob' in...Robert Speicher2017-07-242-3/+3
|\ \ \
| * | | Use a unique feature name for Workhorse send blob migrationfix/use-another-gitaly-feature-name-for-workhorse-send-blobAhmad Sherif2017-07-242-3/+3
* | | | Merge branch '35391-fix-star-i18n-in-js' into 'master'Filipa Lacerda2017-07-243-3/+9
|\ \ \ \
| * | | | Fix translations for Star/Unstar in JS file35391-fix-star-i18n-in-jsRémy Coutable2017-07-213-3/+9
* | | | | Merge branch 'new-nav-duplicated-new-milestone-buttons' into 'master'Filipa Lacerda2017-07-243-3/+13
|\ \ \ \ \
| * | | | | Fixed duplicate new milestone buttons in new navigationnew-nav-duplicated-new-milestone-buttonsPhil Hughes2017-07-243-3/+13
* | | | | | Merge branch '31533-usage-data-projects-stats' into 'master'Sean McGivern2017-07-243-6/+42
|\ \ \ \ \ \
| * | | | | | Add Slack and JIRA services counts to Usage Data31533-usage-data-projects-statsJarka Kadlecova2017-07-243-6/+42
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '33097-issue-tracker' into 'master'Sean McGivern2017-07-2438-130/+656
|\ \ \ \ \ \
| * | | | | | Change docs to support paralel external and internal issue trackersJarka Kadlecova2017-07-243-5/+7
| * | | | | | Support both internal and external issue trackersJarka Kadlecova2017-07-2431-99/+563
| * | | | | | Associate Issues tab only with internal issues trackerJarka Kadlecova2017-07-246-31/+91
| |/ / / / /
* | | | | | Merge branch 'pawel/bump_prometheus_client_library' into 'master'Sean McGivern2017-07-242-1/+5
|\ \ \ \ \ \
| * | | | | | [ci skip] Add Changelog entry metrics files handlingPawel Chojnacki2017-07-241-0/+4
| * | | | | | Fix bug with truncation of file containing metricsPawel Chojnacki2017-07-241-1/+1
* | | | | | | Merge branch 'upgrade-re2' into 'master'Grzegorz Bizon2017-07-245-34/+24
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Upgrade the re2 gem to 1.1.0Nick Thomas2017-07-245-34/+24
| |/ / / / /
* | | | | | Merge branch 'bvl-fix-invalid-po-files' into 'master'Rémy Coutable2017-07-246-19/+17
|\ \ \ \ \ \
| * | | | | | Fix currently invalid po filesbvl-fix-invalid-po-filesBob Van Landuyt2017-07-246-19/+17
| | |/ / / / | |/| | | |
* | | | | | Merge branch '28202_decrease_abc_threshold_step2' into 'master'Rémy Coutable2017-07-245-13/+177
|\ \ \ \ \ \
| * | | | | | Decrease ABC threshold to 56.96Maxim Rydkin2017-07-245-13/+177
|/ / / / / /
* | | | | | Merge branch '34996_add_portuguese_brazil_translations_of_pipeline_schedules'...Rémy Coutable2017-07-241-3/+24
|\ \ \ \ \ \
| * | | | | | Add Portuguese Brazil translations of Pipeline SchedulesHuang Tao2017-07-241-3/+24
|/ / / / / /
* | | | | | Merge branch 'fix/gb/project-update-with-registry-images' into 'master'Rémy Coutable2017-07-243-2/+20
|\ \ \ \ \ \
| * | | | | | Fix editing project with container images presentGrzegorz Bizon2017-07-243-2/+20
|/ / / / / /
* | | | | | Merge branch 'rs-overcreating-users' into 'master'Rémy Coutable2017-07-242-12/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Create guest users only when necessary rather than for every specrs-overcreating-usersRobert Speicher2017-07-212-12/+24
* | | | | | Merge branch 'compress-nav-logo' into 'master'Phil Hughes2017-07-241-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Compress gitlab svg logocompress-nav-logoClement Ho2017-07-211-1/+1
* | | | | | Merge branch '34316-edit-issues-sidebar-needs-some-ui-polish' into 'master'Phil Hughes2017-07-245-11/+28
|\ \ \ \ \ \
| * | | | | | Bulk update sidebar UI polishBryce Johnson2017-07-245-11/+28
|/ / / / / /
* | | | | | Merge branch '35399-mini-graph-commits-box' into 'master'Phil Hughes2017-07-242-1/+9
|\ \ \ \ \ \
| * | | | | | Fix margin in mini graph for commits boxFilipa Lacerda2017-07-242-1/+9
|/ / / / / /
* | | | | | Merge branch '35412-language-space' into 'master'Phil Hughes2017-07-241-3/+3
|\ \ \ \ \ \
| * | | | | | Add space between words in language dropdownFilipa Lacerda2017-07-241-3/+3
|/ / / / / /
* | | | | | Merge branch '35330-fix-nginx-add-haproxy' into 'master'Tim Zallmann2017-07-244-2/+44
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update nginx docs35330-fix-nginx-add-haproxyJoshua Lambert2017-07-211-1/+1
| * | | | | Fix for HA ProxyJoshua Lambert2017-07-201-1/+1
| * | | | | Add HA Proxy metrics, fix NGINXJoshua Lambert2017-07-203-1/+43
* | | | | | Merge branch 'fix-old-ci-api' into 'master'Grzegorz Bizon2017-07-222-1/+67
|\ \ \ \ \ \
| * | | | | | Fix support for old CI API when image or services are not specifiedfix-old-ci-apiKamil Trzcinski2017-07-222-1/+67
* | | | | | | Merge branch 'short-circuit-coverage-with-empty-regex' into 'master'Grzegorz Bizon2017-07-224-5/+32
|\ \ \ \ \ \ \
| * | | | | | | Short-circuit build coverage extraction for empty regexesNick Thomas2017-07-224-5/+32
|/ / / / / / /