Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removed show_new_nav? referencesbreadcrumbs-improvements | Phil Hughes | 2017-09-06 | 6 | -61/+14 |
| | |||||
* | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-06 | 138 | -1451/+2086 |
|\ | |||||
| * | Merge branch 'clean-up-new-nav-templates' into 'master' | Tim Zallmann | 2017-09-06 | 76 | -827/+198 |
| |\ | | | | | | | | | | | | | Clean up new navigation templates See merge request !13983 | ||||
| | * | Clean up new navigation templates | Phil Hughes | 2017-09-06 | 76 | -827/+198 |
| |/ | |||||
| * | Merge branch 'fix-api-docs' into 'master' | Sean McGivern | 2017-09-06 | 4 | -17/+7 |
| |\ | | | | | | | | | | | | | Fix wrong API status codes See merge request !14069 | ||||
| | * | Fix wrong API status codes | Robert Schilling | 2017-09-06 | 4 | -17/+7 |
| | | | |||||
| * | | Merge branch 'mmarif4u/gitlab-ce-36859-update-gpg-docs-with-gpg2' into 'master' | Marcia Ramos | 2017-09-06 | 2 | -0/+15 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update the docs for GPG for gpg2 - [secret key not available]" Closes #36859 See merge request !14024 | ||||
| | * | | Added changelogmmarif4u/gitlab-ce-36859-update-gpg-docs-with-gpg2 | M M Arif | 2017-09-04 | 2 | -0/+15 |
| | | | | |||||
| | * | | Delete git-gpg2-config.png | M M Arif | 2017-09-04 | 1 | -0/+0 |
| | | | | |||||
| | * | | Upload New File | M M Arif | 2017-09-04 | 1 | -0/+0 |
| | | | | |||||
| * | | | Merge branch 'improve-pipeline-visibility-desc' into 'master' | Achilleas Pipinellis | 2017-09-06 | 2 | -5/+38 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 'Visibility of pipelines' Closes #34360 See merge request !13948 | ||||
| | * | | | Update 'Visibility of pipelines' | Fabio Busatto | 2017-09-06 | 2 | -5/+38 |
| |/ / / | |||||
| * | | | Merge branch 'system-checks-incoming-email' into 'master' | Sean McGivern | 2017-09-06 | 9 | -133/+210 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Move Incoming Email checks to System Checks See merge request !14028 | ||||
| | * | | | Refactored Incoming Email checks to use SystemCheck librarysystem-checks-incoming-email | Gabriel Mazetto | 2017-09-04 | 5 | -117/+151 |
| | | | | | |||||
| | * | | | Refactored app/init script check to use dynamic skip reason | Gabriel Mazetto | 2017-09-04 | 1 | -13/+15 |
| | | | | | |||||
| | * | | | Added dynamic skip reason to SystemCheck | Gabriel Mazetto | 2017-09-04 | 3 | -3/+44 |
| | | | | | |||||
| * | | | | Merge branch 'remove-unnecessary-row-grouping' into 'master' | Phil Hughes | 2017-09-06 | 8 | -151/+35 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use flexbox for prometheus graph row grouping instead of bootstrap classes See merge request !14006 | ||||
| | * | | | | Use flexbox for prometheus graph row grouping instead of bootstrap classes | Mike Greiling | 2017-09-06 | 8 | -151/+35 |
| |/ / / / | |||||
| * | | | | Merge branch '27374-groups-groupmemberscontroller-create-is-slow-due-to-sql' ↵ | Douwe Maan | 2017-09-06 | 8 | -49/+90 |
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Optimize Groups::GroupMembersController#create Closes #27374 See merge request !13825 | ||||
| | * | | | Optimize SQL queries used in Groups::GroupMembersController#create27374-groups-groupmemberscontroller-create-is-slow-due-to-sql | Rubén Dávila | 2017-09-05 | 8 | -49/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following optimizations were performed: - Add new association to GroupMember and ProjectMember This new association will allow us to check if a user is a member of a Project or Group through a single query instead of two. - Optimize retrieving of Members when adding multiple Users | ||||
| * | | | | Merge branch '36860-migrate-issues-author' into 'master' | Douwe Maan | 2017-09-06 | 9 | -31/+120 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate old issues without author to the ghost user Closes #36860 See merge request !13860 | ||||
| | * \ \ \ | Merge branch 'master' into '36860-migrate-issues-author'36860-migrate-issues-author | Douwe Maan | 2017-09-05 | 219 | -2885/+11447 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | | | | Remove checks if issue.author is present | Jarka Kadlecova | 2017-09-05 | 4 | -30/+12 |
| | | | | | | | |||||
| | * | | | | | Migrate issues authored by deleted user to the Ghost user | Jarka Kadlecova | 2017-09-05 | 5 | -1/+108 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'gitaly-spinach' into 'master' | Robert Speicher | 2017-09-05 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable all gitaly features in spinach tests Closes gitaly#521 See merge request !14043 | ||||
| | * | | | | | | Enable all gitaly features in spinach testsgitaly-spinach | Alejandro Rodríguez | 2017-09-05 | 1 | -0/+3 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'winh-search-dropdowns' into 'master' | Clement Ho | 2017-09-05 | 4 | -150/+190 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make search dropdowns consistent See merge request !13615 | ||||
| | * | | | | | | Make search dropdowns consistent | Winnie Hellmann | 2017-09-05 | 4 | -150/+190 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'update-issue-search-example' into 'master' | Robert Speicher | 2017-09-05 | 1 | -0/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update issue search example to lorem ipsum See merge request !14057 | ||||
| | * | | | | | | Update issue search example to lorem ipsumupdate-issue-search-example | Sean McGivern | 2017-09-05 | 1 | -0/+0 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch '29786-inconsistent-search-hint' into 'master' | Clement Ho | 2017-09-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change hint format for main filtered search dropdown Closes #29786 See merge request !13895 | ||||
| | * | | | | | | Change hint format for main filtered search dropdown29786-inconsistent-search-hint | Chris Peressini | 2017-09-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change hint format from `type<value>` to `type:value` so it matches the required syntax to perform filtering Fixes #29786 | ||||
| * | | | | | | | Merge branch 'docs-update-confidential-system-note' into 'master' | Clement Ho | 2017-09-05 | 1 | -0/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs update confidential system note See merge request !14063 | ||||
| | * | | | | | | | Docs update confidential system note | Reece Jensen Kemp | 2017-09-05 | 1 | -0/+0 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch '35424-navigation-updates' into 'master' | Filipa Lacerda | 2017-09-05 | 15 | -137/+288 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigation updates Closes #35424 and #35091 See merge request !13480 | ||||
| | * | | | | | | | Top navigation updates | Annabel Dunstone Gray | 2017-09-05 | 15 | -137/+288 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'remove-graph-ql' into 'master' | Stan Hu | 2017-09-05 | 1 | -10/+1 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove GraphQL from future plans. See merge request !14060 | ||||
| | * | | | | | | | Update wording on change plans. | Jacob Schatz | 2017-09-05 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Provide context for people wondering what happened. | Jacob Schatz | 2017-09-05 | 1 | -0/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove GraphQL from future plans. | Jacob Schatz | 2017-09-05 | 1 | -13/+0 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'sh-bump-jira-gem' into 'master' | Robert Speicher | 2017-09-05 | 3 | -3/+9 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxies Closes gitlab-ee#3125 See merge request !13617 | ||||
| | * | | | | | | | Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxies | Stan Hu | 2017-09-05 | 3 | -3/+9 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous versions of jira-ruby gem would generate erroneous URLs when an HTTP proxy were confused via the `http_proxy` environment variables: https://github.com/sumoheavy/jira-ruby/issues/250 Closes gitlab-org/gitlab-ee#3125 | ||||
| * | | | | | | | Merge branch 'cleanup-rspec_flaky-report-files' into 'master' | Robert Speicher | 2017-09-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup rspec_flaky report files in the update-tests-metadata job See merge request !14056 | ||||
| | * | | | | | | | Cleanup rspec_flaky report files in the update-tests-metadata jobcleanup-rspec_flaky-report-files | Rémy Coutable | 2017-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Merge branch 'feature/migrate-find-branch-to-gitaly' into 'master' | Robert Speicher | 2017-09-05 | 6 | -25/+53 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#find_branch to Gitaly Closes gitaly#502 See merge request !13873 | ||||
| | * | | | | | | | Migrate Gitlab::Git::Repository#find_branch to Gitaly | Ahmad Sherif | 2017-09-05 | 6 | -25/+53 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'api-gpg-key-management' into 'master' | Sean McGivern | 2017-09-05 | 5 | -0/+696 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Add GPG key management Closes #36926 See merge request !13828 | ||||
| | * | | | | | | | Add documentation | Robert Schilling | 2017-09-05 | 1 | -0/+211 |
| | | | | | | | | | |||||
| | * | | | | | | | API: Add GPG key management for admins | Robert Schilling | 2017-09-05 | 2 | -0/+238 |
| | | | | | | | | | |||||
| | * | | | | | | | API: Add GPG key management | Robert Schilling | 2017-09-05 | 4 | -0/+247 |
| | | | | | | | | |