summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Update CHANGELOG.md for 9.4.2James Edwards-Jones2017-07-2813-49/+15
| | | [ci skip]
* Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'9-4-stable-patch-2Rémy Coutable2017-07-281-1/+3
|\ | | | | | | | | Resolve "Impersonation Tokens creation spec failure in admin_users_impersonation_tokens_spec.rb" See merge request !13145
| * wait after clicking for execute to complete35643-impersonate-specSimon Knox2017-07-281-1/+3
|/
* Merge branch ↵Rémy Coutable2017-07-2710-9/+79
| | | | | | | | | | '35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters' into 'master' Resolve "Can't create a merge request containing a binary file with non-UTF-8 characters" Closes #35539 See merge request !13086
* Merge branch 'rc/35599-stop-the-bleeding-of-default_url_options' into 'master'Sean McGivern2017-07-271-0/+4
| | | | | Ensure the overriding of Gitlab::Application.routes.default_url_options is only local See merge request !13125
* Merge branch '9-4-stable-patch-2' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-07-279-64/+400
|\ | | | | | | 9-4-stable-patch-2
| * Merge branch 'add-ldap-ssl-certificate-verification-9-4' into ↵Simon Knox2017-07-279-64/+400
| |\ | | | | | | | | | | | | | | | | | | '9-4-stable-patch-2' Add LDAP SSL certificate verification [9.4] See merge request !13107
| | * Merge branch 'mk-add-ldap-ssl-certificate-verification' into 'master'add-ldap-ssl-certificate-verification-9-4Douwe Maan2017-07-269-64/+400
| | | | | | | | | | | | | | | | | | | | | | | | Add LDAP SSL certificate verification See merge request !2115 # Conflicts: # Gemfile.lock
* | | Merge branch '34964-have_gitlab_http_status' into 'master'Rémy Coutable2017-07-272-2/+16
|/ / | | | | | | | | | | | | Introduce have_gitlab_http_status Closes #34964 See merge request !12883
* | Merge branch 'mk-add-lower-path-index-to-redirect-routes' into 'master'Yorick Peterse2017-07-274-1/+41
| | | | | | | | | | | | | | | | Add lower path index to redirect_routes Closes #34638 See merge request !13062
* | Add patch for Prometheus metric updates.Ben Kochie2017-07-2711-109/+89
| | | | | | | | Include patch of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12812
* | Merge branch 'add-missing-colon' into 'master'Sean McGivern2017-07-271-1/+1
| | | | | | | | | | Add missing colon See merge request !13099
* | Merge branch 'new-navigation-custom-logo' into 'master'Filipa Lacerda2017-07-272-0/+9
| | | | | | | | | | | | | | Fixed custom logo sizing in new navigation header Closes #35439 See merge request !13034
* | Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' ↵Sean McGivern2017-07-273-1/+26
| | | | | | | | | | | | | | | | | | into 'master' Fixes 500 error caused by pending delete projects in admin dashboard Closes #35453 See merge request !13067
* | Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' ↵Sean McGivern2017-07-273-2/+8
| | | | | | | | | | | | | | | | | | into 'master' Pending delete projects should now show in deploy keys Closes #35338 See merge request !13088
* | Merge branch '35000_add_ukrainian_translations_of_pipeline_schedules' into ↵Rémy Coutable2017-07-271-41/+64
| | | | | | | | | | | | | | | | | | 'master' Add Ukrainian translations of Pipeline Schedules Closes #35000 See merge request !12827
* | Merge branch '35474-fix-new-issue' into 'master'Phil Hughes2017-07-272-2/+20
| | | | | | | | | | | | | | Move relative_path to the element that is being clicked Closes #35474 See merge request !13079
* | Merge branch '2971-multiproject-grah-ce-port' into 'master'Phil Hughes2017-07-272-1/+6
| | | | | | | | | | Fix vertical alignment in firefox and safari for pipeline mini graph See merge request !13071
* | Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'Sean McGivern2017-07-272-0/+7
| | | | | | | | | | Adds link_to_gfm method instrumentation See merge request !13069
* | Merge branch 'fix/gb/fix-build-merge-request-link-to-fork-project' into 'master'Kamil Trzciński2017-07-273-21/+75
| | | | | | | | | | | | | | Fix job merge request link to a forked source project Closes #35109 See merge request !12965
* | Merge branch '35478-allow-admin-to-read-user-list' into 'master'Rémy Coutable2017-07-274-8/+37
| | | | | | | | | | | | | | Allow admin to read_users_list even if it's restricted Closes #35478 See merge request !13066
* | Merge branch '34729-blob' into 'master'Douwe Maan2017-07-272-1/+5
| | | | | | | | | | | | | | snippet has a blob, but isn't a blob Closes #34729 See merge request !12792
* | Merge branch '35556-align-button' into '9-4-stable-patch-2'James Edwards-Jones2017-07-262-0/+5
|\ \ | |/ |/| | | | | fix vertical alignment of New Project button See merge request !13098
| * 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
View Lorry Controller Status