| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update VERSION to 9.4.3v9.4.3 | Jose Ivan Vargas | 2017-07-31 | 1 | -1/+1 |
| | | |||||
| * | Update CHANGELOG.md for 9.4.3 | Jose Ivan Vargas | 2017-07-31 | 8 | -29/+10 |
| | | | | [ci skip] | ||||
| * | Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'9-4-stable-patch-3 | Robert Speicher | 2017-07-31 | 4 | -3/+11 |
| | | | | | | Fix prometheus client pid reuse bug See merge request !13130 | ||||
| * | Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into ↵ | Douwe Maan | 2017-07-31 | 6 | -77/+110 |
| | | | | | | | | | | 'master' Ensure test files are deleted after fs metrics gathering run Closes #35457 See merge request !13080 | ||||
| * | Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master' | Kamil Trzciński | 2017-07-31 | 7 | -53/+94 |
| | | | | | | | | Improve deploy environment chatops slash command Closes #34748 See merge request !13150 | ||||
| * | Merge branch '35567-fix-relative-urls-in-webpack-public-path' into 'master' | Douwe Maan | 2017-07-31 | 2 | -1/+8 |
| | | | | | | | | Fix relative_url_root support for webpack chunks Closes #35567 See merge request !13165 | ||||
| * | Merge branch 'dm-ldap-authentication-ssl-verification' into 'master' | Sean McGivern | 2017-07-31 | 2 | -1/+5 |
| | | | | | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor Closes #35752 See merge request !13185 | ||||
| * | Merge branch 'fix-docs-re2-install' into 'master' | Rémy Coutable | 2017-07-31 | 1 | -1/+1 |
| | | | | | | | | Add libre2-dev to the list of dependencies Closes #35342 See merge request !12996 | ||||
| * | Merge branch '35482-dropdown' into 'master' | Annabel Dunstone Gray | 2017-07-31 | 1 | -4/+4 |
| | | | | | | | | fix :focus styles for selected filter dropdown items Closes #35482 See merge request !13070 | ||||
| * | Merge branch 'new-nav-issue-boards-height' into 'master' | Annabel Dunstone Gray | 2017-07-31 | 1 | -1/+1 |
| | | | | | | | | Fix height of issue boards with new navigation Closes #35299 See merge request !12985 | ||||
| * | Merge branch 'win-newnav-badges-firefox' into 'master' | Phil Hughes | 2017-07-31 | 2 | -3/+3 |
| | | | | | | | | Fix badge positioning in new navigation for Firefox Closes #35634 See merge request !13186 | ||||
| * | Merge branch '35672-edge-top-bar' into 'master' | Phil Hughes | 2017-07-31 | 2 | -0/+5 |
| | | | | | | | | Fix top bar in jobs view for microsoft edge Closes #35672 See merge request !13175 | ||||
| * | Merge branch 'help-page-breadcrumb-title-fix' into 'master' | Filipa Lacerda | 2017-07-31 | 2 | -0/+5 |
| | | | | | | | | Fixed the breadcrumb title for help pages Closes #35679 See merge request !13151 | ||||
| * | Merge branch 'winh-issuable-sidebar-height' into 'master' | Tim Zallmann | 2017-07-31 | 1 | -0/+4 |
| | | | | | | | | Make issuable searchbar full height Closes #35417 See merge request !13046 | ||||
| * | Update VERSION to 9.4.2v9.4.2 | James Edwards-Jones | 2017-07-28 | 1 | -1/+1 |
| | | |||||
| * | Update CHANGELOG.md for 9.4.2 | James Edwards-Jones | 2017-07-28 | 13 | -49/+15 |
| | | | | [ci skip] | ||||
| * | Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'9-4-stable-patch-2 | Rémy Coutable | 2017-07-28 | 1 | -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-spec | Simon Knox | 2017-07-28 | 1 | -1/+3 |
| |/ | |||||
| * | Merge branch ↵ | Rémy Coutable | 2017-07-27 | 10 | -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 McGivern | 2017-07-27 | 1 | -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 Knox | 2017-07-27 | 9 | -64/+400 |
| |\ | | | | | | | 9-4-stable-patch-2 | ||||
| | * | Merge branch 'add-ldap-ssl-certificate-verification-9-4' into ↵ | Simon Knox | 2017-07-27 | 9 | -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-4 | Douwe Maan | 2017-07-26 | 9 | -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 Coutable | 2017-07-27 | 2 | -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 Peterse | 2017-07-27 | 4 | -1/+41 |
| | | | | | | | | | | | | | | | | | Add lower path index to redirect_routes Closes #34638 See merge request !13062 | ||||
| * | | Add patch for Prometheus metric updates. | Ben Kochie | 2017-07-27 | 11 | -109/+89 |
| | | | | | | | | | Include patch of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12812 | ||||
| * | | Merge branch 'add-missing-colon' into 'master' | Sean McGivern | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | | | | | Add missing colon See merge request !13099 | ||||
| * | | Merge branch 'new-navigation-custom-logo' into 'master' | Filipa Lacerda | 2017-07-27 | 2 | -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 McGivern | 2017-07-27 | 3 | -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 McGivern | 2017-07-27 | 3 | -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 Coutable | 2017-07-27 | 1 | -41/+64 |
| | | | | | | | | | | | | | | | | | | | 'master' Add Ukrainian translations of Pipeline Schedules Closes #35000 See merge request !12827 | ||||
| * | | Merge branch '35474-fix-new-issue' into 'master' | Phil Hughes | 2017-07-27 | 2 | -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 Hughes | 2017-07-27 | 2 | -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 McGivern | 2017-07-27 | 2 | -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ński | 2017-07-27 | 3 | -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 Coutable | 2017-07-27 | 4 | -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 Maan | 2017-07-27 | 2 | -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-Jones | 2017-07-26 | 2 | -0/+5 |
| |\ \ | |/ |/| | | | | | fix vertical alignment of New Project button See merge request !13098 | ||||
| | * | fix vertical alignment of New Project button35556-align-button | Simon Knox | 2017-07-26 | 2 | -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.1 | James Edwards-Jones | 2017-07-25 | 1 | -1/+1 |
| | | |||||
| * | Update CHANGELOG.md for 9.4.1 | James Edwards-Jones | 2017-07-25 | 10 | -37/+12 |
| | | | | [ci skip] | ||||
| * | Merge branch 'bvl-fix-login-issue-with-ldap-enabled' into 'master' | Robert Speicher | 2017-07-24 | 2 | -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 Lacerda | 2017-07-24 | 2 | -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!12795 | Mike Greiling | 2017-07-24 | 1 | -1/+1 |
| | | |||||
| * | Merge branch '35156-more-responsive-nav' into 'master' | Clement Ho | 2017-07-24 | 3 | -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 Speicher | 2017-07-24 | 13 | -32/+187 |
| | | | | | | | | Clear issuable count cache on update Closes #34772 See merge request !12795 | ||||
| * | Merge branch '35330-fix-nginx-add-haproxy' into 'master' | Tim Zallmann | 2017-07-24 | 4 | -2/+44 |
| | | | | | | Fix NGINX Error Rate query, include HA Proxy See merge request !13005 | ||||
| * | Merge branch 'compress-nav-logo' into 'master' | Phil Hughes | 2017-07-24 | 1 | -1/+1 |
| | | | | | | Compress gitlab SVG logo See merge request !13026 | ||||
| * | Merge branch '35236-svg-logo' into 'master' | Phil Hughes | 2017-07-24 | 3 | -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 Speicher | 2017-07-24 | 6 | -6/+37 |
| | | | | | | | | | Resolve "Error 500 viewing notes with anonymous user" Closes #35444 See merge request !13037 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |