summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix vertical alignment of New Project button35556-align-buttonSimon Knox2017-07-262-0/+5
| | | | picked from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12944/diffs#3a262e1127de2eedf195d81146090d46487cc967_303_301
* Update VERSION to 9.4.1v9.4.1James Edwards-Jones2017-07-251-1/+1
|
* Update CHANGELOG.md for 9.4.1James Edwards-Jones2017-07-2510-37/+12
| | | [ci skip]
* Merge branch 'bvl-fix-login-issue-with-ldap-enabled' into 'master'Robert Speicher2017-07-242-0/+13
| | | | | | | Load the sessionscontroller after loading the ldap strategies Closes #35447 See merge request !13049
* Merge branch 'issue-boards-close-icon-size' into 'master'Filipa Lacerda2017-07-242-1/+8
| | | | | | | Fixed issue boards sidebar close button with new navigation Closes #35296 See merge request !12991
* fix failing test from gitlab-org/gitlab-ce!12795Mike Greiling2017-07-241-1/+1
|
* Merge branch '35156-more-responsive-nav' into 'master'Clement Ho2017-07-243-8/+31
| | | | | | | fix resize bug for title and collapsible nav menus Closes #35156 See merge request !12904
* Merge branch 'clear-issuable-count-cache-for-states' into 'master'Robert Speicher2017-07-2413-32/+187
| | | | | | | Clear issuable count cache on update Closes #34772 See merge request !12795
* Merge branch '35330-fix-nginx-add-haproxy' into 'master'Tim Zallmann2017-07-244-2/+44
| | | | | Fix NGINX Error Rate query, include HA Proxy See merge request !13005
* Merge branch 'compress-nav-logo' into 'master'Phil Hughes2017-07-241-1/+1
| | | | | Compress gitlab SVG logo See merge request !13026
* Merge branch '35236-svg-logo' into 'master'Phil Hughes2017-07-243-4/+17
| | | | | | | Use custom font SVG for logo Closes #35236 See merge request !13018
* Merge branch '35444-error-500-viewing-notes-with-anonymous-user' into 'master'Robert Speicher2017-07-246-6/+37
| | | | | | | | Resolve "Error 500 viewing notes with anonymous user" Closes #35444 See merge request !13037
* Merge branch 'bvl-fix-invalid-po-files' into 'master'Rémy Coutable2017-07-246-14/+36
| | | | | | | | Fix currently invalid po files Closes #35302 and #35235 See merge request !13032
* Merge branch 'fix/sm/32790-pipeline_schedules-pages-throwing-error-500' into ↵Grzegorz Bizon2017-07-243-1/+29
| | | | | | | | | 'master' Follow-up from "Resolve "pipeline_schedules pages throwing error 500"" Closes #35345, #32790, and #34652 See merge request !12983
* Merge branch ↵Rémy Coutable2017-07-241-7/+26
| | | | | | | | | '34995_add_traditional_chinese_in_taiwan_translations_of_pipeline_schedules' into 'master' Add Traditional Chinese in Taiwan translations of Pipeline Schedules Closes #34995 See merge request !12982
* Merge branch ↵Rémy Coutable2017-07-241-3/+24
| | | | | | | | | '34996_add_portuguese_brazil_translations_of_pipeline_schedules' into 'master' Add Portuguese Brazil translations of Pipeline Schedules Closes #34996 See merge request !12823
* Merge branch '35178-remember-me-in-omniauth-box-seems-too-close-to-icons' ↵Clement Ho2017-07-242-3/+3
| | | | | | | | | into 'master' add margin above Remember Me for social login Closes #35178 See merge request !12957
* Merge branch 'docs-trello-power-up' into 'master'Marcia Ramos2017-07-244-0/+43
| | | | | Add GitLab Trello Power-Up Documentation See merge request !12997
* Merge branch 'fix/gb/qa/fix-new-project-selectors' into 'master'Rémy Coutable2017-07-245-12/+25
| | | | | | | Fix new project selectors in GitLab QA Closes gitlab-qa#57 See merge request !13012
* Merge branch '35399-mini-graph-commits-box' into 'master'Phil Hughes2017-07-242-1/+9
| | | | | | | Fix margin in mini graph for commits box Closes #35399 and #35383 See merge request !13014
* Merge branch 'short-circuit-coverage-with-empty-regex' into 'master'Grzegorz Bizon2017-07-244-5/+32
| | | | | Short-circuit build coverage extraction for empty regexes See merge request !13015
* Merge branch 'breadcrumbs-px-height' into 'master'Phil Hughes2017-07-241-3/+1
| | | | | | Add 1px to breadcrumbs min height See merge request !13020
* Merge branch 'fix-old-ci-api' into 'master'Grzegorz Bizon2017-07-242-1/+67
| | | | | | | Fix support for old CI API when image or services are not specified Closes #35421 See merge request !13023
* Merge branch '35368-fix-gcovr-regexp-matching' into 'master'Grzegorz Bizon2017-07-242-0/+8
| | | | | | | Fix the gcovr coverage regex by removing line separators before scanning Closes #35368 See merge request !13025
* Merge branch 'fix/gb/project-update-with-registry-images' into 'master'Rémy Coutable2017-07-243-2/+20
| | | | | | | Fix editing project with container images present Closes #35443 See merge request !13028
* Merge branch 'new-nav-duplicated-new-milestone-buttons' into 'master'Filipa Lacerda2017-07-243-3/+13
| | | | | | | Fixed duplicate new milestone buttons in new navigation Closes #35454 See merge request !13033
* Merge branch 'pawel/bump_prometheus_client_library' into 'master'Sean McGivern2017-07-242-1/+5
| | | | | Fix bug causing truncation of Metrics files See merge request !13035
* Update VERSION to 9.4.0v9.4.0James Edwards-Jones2017-07-221-1/+1
|
* Update CHANGELOG.md for 9.4.0James Edwards-Jones2017-07-22189-764/+187
| | | [ci skip]
* Update VERSION to 9.4.0-rc6v9.4.0-rc6James Edwards-Jones2017-07-211-1/+1
|
* Revert "Merge branch 'bjk/metric_names' into 'master'"9-4-stable-prepare-rc6James Edwards-Jones2017-07-2111-114/+109
| | | | This reverts commit b639ed9f07174c06424586a08db0ed0cde654e54.
* Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-2011-109/+114
| | | | | | | | Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812
* Merge branch '34973-sub-nav-item-font-size' into 'master'Annabel Dunstone Gray2017-07-202-1/+4
| | | | | | | 34973 Make font size of contextual sub menu items 14px Closes #34973 See merge request !12951
* Merge branch '34174_add_french_translations_of_commits_page' into 'master'Rémy Coutable2017-07-202-28/+1098
| | | | | | | Add French translations of Commits Page & Pipeline Charts Closes #34174 and #34794 See merge request !12409
* Merge branch ↵Rémy Coutable2017-07-201-2/+23
| | | | | | | | | | '34998_add_bulgarian_translations_translations_of_pipeline_schedules' into 'master' Add Bulgarian translations of Pipeline Schedules Closes #34998 See merge request !12825
* Merge branch ↵Rémy Coutable2017-07-201-2/+23
| | | | | | | | | | '35001_add_esperanto_translations_translations_of_pipeline_schedules' into 'master' Add Esperanto translations of Pipeline Schedules Closes #35001 See merge request !12828
* Merge branch ↵Rémy Coutable2017-07-201-1/+21
| | | | | | | | | | '34994_add_traditional_chinese_in_hongkong_translations_of_pipeline_schedules' into 'master' Add Traditional Chinese in HongKong translations of Pipeline Schedules Closes #34994 See merge request !12822
* Merge branch ↵Rémy Coutable2017-07-201-1/+21
| | | | | | | | | | '34993_add_simplified_chinese_translations_of_pipeline_schedules' into 'master' Add Simplified Chinese translations of Pipeline Schedules Closes #34993 See merge request !12821
* Merge branch 'htve/gitlab-ce-34880_add_ukrainian_translations_to_i18n'Rémy Coutable2017-07-204-0/+1238
| | | | | | See merge request !12744. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '34789_add_japanese_translations_to_i18n' into 'master'Rémy Coutable2017-07-204-1/+7
| | | | | | | | Add Japanese Translation to i18n Closes #34789 See merge request !12693
* Merge branch '34999_add_japanese_translations_of_pipeline_schedules' into ↵Rémy Coutable2017-07-201-0/+1203
| | | | | | | | | | 'master' Add Japanese translations of Pipeline Schedules Closes #34999 See merge request !12826
* Merge branch 'bvl-free-system-namespace' into 'master'Sean McGivern2017-07-2034-38/+302
| | | | | | | | Free `system` namespace by moving uploads into `uploads/-` Closes #33550 See merge request !12917
* Merge branch 'issue_35132' into 'master'Sean McGivern2017-07-205-11/+15
| | | | | | | Fix external issue trackers redirect Closes #35132 See merge request !12923
* Merge branch 'pawel/prometheus_multiproc_dir_documentation' into 'master'Filipa Lacerda2017-07-202-5/+24
| | | | | Documentation and link to explanation of prometheus_multiproc_dir See merge request !12956
* Merge branch 'update-gitaly-to-0.21.2' into 'master'Robert Speicher2017-07-201-1/+1
| | | | | Update Gitaly Server Version to 0.21.2 See merge request !12937
* Merge branch 'perf/policy-class-cache' into 'master'Sean McGivern2017-07-203-17/+51
| | | | | Perf: Improve performance of basic ruby ops in DeclarativePolicy See merge request !12922
* Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-206-6/+97
| | | | | | | Fix docker tag reference routing constraints Closes #35220 and gitlab-com/support-forum#2246 See merge request !12961
* Merge branch '34173_add_portuguese_brazil_translations_of_commits_page' into ↵Rémy Coutable2017-07-202-6/+107
| | | | | | | | | 'master' Add Portuguese Brazil translations of Commits Page & Pipeline Charts Closes #34173 See merge request !12408
* Merge branch '34881_add_russian_translations_to_i18n' into 'master'Rémy Coutable2017-07-204-0/+1237
| | | | | | | Add Russian Translations To I18N Closes #34881 See merge request !12743
* Merge branch 'fix-issue-tracker-spec' into 'master'Rémy Coutable2017-07-201-18/+9
| | | | | | | Prevent GitLab issue tracker spec from failing later specs Closes #35042 See merge request !12835