summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix inconsistent deploy key documentation in UImrchrisw-update-deploy-keyChris Wilson2017-03-081-1/+1
| | | | | | | | | | Deploy keys were added with write access to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383 - We still state " Deploy keys allow read-only access to your repository." in the UI. This updates the deploy key UI information to reflect the docs https://docs.gitlab.com/ce/ssh/README.html#deploy-keys
* Merge branch 'patch-15' into 'master' Rémy Coutable2017-03-081-1/+1
|\ | | | | | | | | Update container_registry.md: fix private-docker link See merge request !9686
| * Update container_registry.md: fix private-docker linkNeroBurner2017-03-031-1/+1
| |
* | Merge branch '26202-change-dropdown-style-slightly' into 'master' Annabel Dunstone Gray2017-03-082-10/+18
|\ \ | | | | | | | | | | | | | | | | | | Changed dropdown style slightly Closes #26202 See merge request !9747
| * | Changed dropdown style slightly26202-change-dropdown-style-slightlydimitrieh2017-03-082-10/+18
| | |
* | | Merge branch 'fix-visual-tokens' into 'master' Alfredo Sumaran2017-03-085-25/+81
|\ \ \ | | | | | | | | | | | | | | | | Prevent visual token dropdown from opening the wrong filter dropdown See merge request !9789
| * | | Prevent visual token dropdown from opening the wrong filter dropdownfix-visual-tokensClement Ho2017-03-085-25/+81
| | | |
* | | | Merge branch '29185-environments-folder-links' into 'master' Annabel Dunstone Gray2017-03-083-5/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style action buttons in show environments view to match index view Closes #29185 See merge request !9804
| * | | | Apply same html and css to the action buttons in environment show view table ↵29185-environments-folder-linksFilipa Lacerda2017-03-083-5/+4
| | | | | | | | | | | | | | | | | | | | as the ones in index table
* | | | | Merge branch 'diff-comments-avatars' into 'master' Jacob Schatz2017-03-0818-52/+566
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added discussion comments avatars to diff Closes #17237 See merge request !7357
| * | | | | Added discussion comments avatars to diffPhil Hughes2017-03-0818-52/+566
|/ / / / /
* | | | | Merge branch 'update_GITLAB_SHELL_VERSION' into 'master' Sean McGivern2017-03-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update GITLAB_SHELL_VERSION to 5.0.0 See merge request !9809
| * | | | | Update GITLAB_SHELL_VERSION to 5.0.0Pawel Chojnacki2017-03-081-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | Related to gitlab-ee#1648
* | | | | Merge branch 'dm-remove-double-project-nav-bar' into 'master' Robert Speicher2017-03-082-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Don't show double nav bar on project page when activity is the default project view Closes #29096 See merge request !9798
| * | | | Don't show double nav bar on project page when activity is the default ↵dm-remove-double-project-nav-barDouwe Maan2017-03-072-1/+1
| | | | | | | | | | | | | | | | | | | | project view
* | | | | Merge branch 'sh-speed-up-refresh-service' into 'master' Rémy Coutable2017-03-081-47/+57
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Speed up MergeRequest::RefreshService spec by combining examples See merge request !9801
| * | | | | Speed up MergeRequest::RefreshService spec by combining examplessh-speed-up-refresh-serviceStan Hu2017-03-081-47/+57
| | | | | |
* | | | | | Merge branch 'fix/29093' into 'master' Sean McGivern2017-03-085-14/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 'Object not found - no match for id (sha)' when importing GitHub PRs Closes #29093 See merge request !9751
| * | | | | | Add CHANGELOGfix/29093Douglas Barbosa Alexandre2017-03-071-0/+4
| | | | | | |
| * | | | | | Fix 'Object not found - no match for id (sha)' when importing GitHub PRsDouglas Barbosa Alexandre2017-03-074-14/+14
| | | | | | |
* | | | | | | Merge branch '26188-tag-creation-404-for-guests' into 'master' Rémy Coutable2017-03-083-2/+35
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show links to tag a commit for non permitted users Closes #26188 See merge request !8407
| * | | | | | Don't show links to tag a commit for non permitted usersMark Fletcher2017-03-073-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Show tag link for users that can push code * Don't show tag link for guests and non-authenticated users
* | | | | | | Merge branch 'settings-tab' into 'master' fl-links-environmentsClement Ho2017-03-0814-65/+90
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the settings gear button inside the project view to a tab Closes #26733 See merge request !9786
| * | | | | | fixed user_access_request_specsettings-tabJose Ivan Vargas2017-03-071-1/+7
| | | | | | |
| * | | | | | Fixed changelog and a haml condition project.html.hamlJose Ivan Vargas2017-03-072-9/+9
| | | | | | |
| * | | | | | Fixed some typos inside the _project.html.haml partialJose Ivan Vargas2017-03-072-3/+3
| | | | | | |
| * | | | | | Added MR number to changelogJose Ivan Vargas2017-03-071-1/+1
| | | | | | |
| * | | | | | Removed the settings gear button inside the Project to a tabJose Ivan Vargas2017-03-0713-64/+83
| | | | | | |
* | | | | | | Merge branch 'filtered-search-visual-tokens-improvements' into 'master' Alfredo Sumaran2017-03-083-3/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Filtered Search Visual Tokens code improvements See merge request !9781
| * | | | | | Code improvementsfiltered-search-visual-tokens-improvementsClement Ho2017-03-073-3/+4
| | | | | | |
* | | | | | | Merge branch 'add-changelog-filtered-search-visual-tokens' into 'master' Alfredo Sumaran2017-03-081-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog for filtered-search-visual-tokens See merge request !9799
| * | | | | | | Add changelog for filtered-search-visual-tokensadd-changelog-filtered-search-visual-tokensClement Ho2017-03-071-0/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix-fs-edit-dropdown' into 'master' Alfredo Sumaran2017-03-082-3/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filtered search visual token editing dropdown See merge request !9794
| * | | | | | | Fix filtered search visual token editing dropdownfix-fs-edit-dropdownClement Ho2017-03-072-3/+21
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix-edit-last-visual-token' into 'master' Alfredo Sumaran2017-03-083-6/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix edit last visual token See merge request !9791
| * | | | | | | Fix edit last visual tokenfix-edit-last-visual-tokenClement Ho2017-03-073-6/+19
| |/ / / / / /
* | | | | | | Merge branch 'update_crowd_docs' into 'master' Achilleas Pipinellis2017-03-084-64/+70
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move and update Crowd authentication documentation See merge request !9775
| * | | | | | | Move and update Crowd authentication documentationDrew Blessing2017-03-074-64/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current docs did not include information on configuring the app in Crowd. Also, moved the doc to the new administration/auth directory.
* | | | | | | | Merge branch 'filtered-search-visual-tokens' into 'master' Alfredo Sumaran2017-03-0832-376/+2244
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filtered search visual tokens Closes #26652 See merge request !8969
| * | | | | | | Add filtered search visual tokensfiltered-search-visual-tokensClement Ho2017-03-0732-376/+2244
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'patch-15' into 'master' Achilleas Pipinellis2017-03-081-0/+58
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Add configuration instructions for Container Registry Notifications. See merge request !9500
| * | | | | | Add configuration instructions for Container Registry Notifications.[ci skip]Alexandre Gomes2017-03-071-0/+58
| | | | | | |
* | | | | | | Merge branch 'rs-fix-todo-service-spec' into 'master' Douwe Maan2017-03-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix transient failure in TodoService spec See merge request !9797
| * | | | | | | Fix transient failure in TodoService specRobert Speicher2017-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For reasons unknown, the lack of `and_call_original` on this message expectation was causing a transient failure depending on test order. We narrowed it down using `rspec --bisect` to the following order: spec/requests/openid_connect_spec.rb:123 spec/services/todo_service_spec.rb:751
* | | | | | | | Merge branch 'issue_16834'Douwe Maan2017-03-0710-172/+564
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * | | | | | | | Remove unecessary endpoint from repository, add compatibility endpoints for ↵issue_16834Felipe Artur2017-03-078-120/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v3 and several improvements
| * | | | | | | | Update API endpoints for raw filesFelipe Artur2017-03-078-145/+328
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'dm-nested-groups-go-get' into 'master' Douwe Maan2017-03-082-18/+143
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix go-get support for projects in nested groups See merge request !9793
| * | | | | | | | Fix go-get support for projects in nested groupsdm-nested-groups-go-getDouwe Maan2017-03-072-18/+143
| |/ / / / / / /
* | | | | | | | Merge branch '1381-present-commits-pagination-headers-correctly' into 'master' Douwe Maan2017-03-088-13/+195
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GET "projects/:id/repository/commits" endpoint improvements Closes #1381 and #20207 See merge request !9679
View Lorry Controller Status