summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Accepting Sean's suggestionan/network-controller-fixAndrew Newdigate2018-03-061-6/+1
|
* Remove `allow_n_plus_1_calls` blockAndrew Newdigate2018-03-062-14/+16
|
* Fixed Gitaly n+1 in NetworkController#showAndrew Newdigate2018-03-051-3/+3
|
* Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'Robert Speicher2018-03-0512-33/+143
|\ | | | | | | | | Create CI/CD-only projects by URL -- CE backport See merge request gitlab-org/gitlab-ce!17342
| * CI/CD-only projects FEEric Eastwood2018-03-0512-31/+137
| | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot
| * Backport BE changes from CI/CD projects ee!4567Eric Eastwood2018-03-021-2/+6
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4567
* | Merge branch 'sh-fix-issue-43871-system-hooks' into 'master'Robert Speicher2018-03-053-2/+15
|\ \ | | | | | | | | | | | | | | | | | | Don't error out in system hook if user has `nil` datetime columns Closes #43871 See merge request gitlab-org/gitlab-ce!17543
| * | Don't error out in system hook if user has `nil` datetime columnsStan Hu2018-03-053-2/+15
| | | | | | | | | | | | | | | | | | | | | Deleting a user would fail in the system hooks if the user had `nil` column in `datetime` or `updated_at` fields. Closes #43871
* | | Merge branch 'feature/oauth_generic_provider' into 'master'Douwe Maan2018-03-058-20/+86
|\ \ \ | | | | | | | | | | | | | | | | Make oauth provider login generic See merge request gitlab-org/gitlab-ce!8809
| * | | Make oauth provider login genericHoratiu Eugen Vlad2018-03-058-20/+86
|/ / /
* | | Merge branch 'sh-cleanup-after-git-gc' into 'master'Robert Speicher2018-03-053-0/+15
|\ \ \ | | | | | | | | | | | | | | | | Release libgit2 cache and open file descriptors after `git gc` run See merge request gitlab-org/gitlab-ce!17506
| * | | Release libgit2 cache and open file descriptors after `git gc` runsh-cleanup-after-git-gcStan Hu2018-03-033-0/+15
| |/ / | | | | | | | | | Relates to #21879
* | | Merge branch 'issue_31081' into 'master'Douwe Maan2018-03-054-6/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use host URL to build JIRA remote link icon Closes #31081 See merge request gitlab-org/gitlab-ce!17541
| * | | Use host URL to build JIRA remote link iconFelipe Artur2018-03-054-6/+14
| | | |
* | | | Merge branch '43829-update-ssh-addtion-text' into 'master'Douwe Maan2018-03-052-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "SSH key add text" Closes #43829 See merge request gitlab-org/gitlab-ce!17527
| * | | | Resolve "SSH key add text"Brendan O'Leary 🐢2018-03-052-1/+8
|/ / / /
* | | | Merge branch 'dz-use-less-deprecated-methods' into 'master'Douwe Maan2018-03-0580-142/+146
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
| * | | Revert few more broken specs related to *_with_namespace methodsdz-use-less-deprecated-methodsDmitriy Zaporozhets2018-03-052-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Revert js changes to name_with_namespaceDmitriy Zaporozhets2018-03-052-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Update workers spec to use full_path instead of path_with_namespaceDmitriy Zaporozhets2018-03-054-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-0542-83/+83
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Replace deprecated name_with_namespace with full_name in app/viewsDmitriy Zaporozhets2018-03-0528-35/+35
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Replace deprecated path_with_namespace with full_pathDmitriy Zaporozhets2018-03-058-23/+27
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fj-41174-projects-groups-badges-api' into 'master'Douwe Maan2018-03-0543-549/+1793
|\ \ \ | | | | | | | | | | | | | | | | Projects and groups badges API See merge request gitlab-org/gitlab-ce!17082
| * | | Projects and groups badges APIFrancisco Javier López2018-03-0543-549/+1793
|/ / /
* | | Merge branch 'jprovazn-count-cleanup' into 'master'43739-gl_repository-not-set-when-merging-merge-requests-from-the-web-uiRobert Speicher2018-03-059-7/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cleanup after adding MR diff's commit_count Closes #41698 See merge request gitlab-org/gitlab-ce!17513
| * | | Cleanup after adding MR diff's commit_countJan Provaznik2018-03-059-7/+18
| |/ / | | | | | | | | | | | | | | | * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method
* | | Merge branch 'fix-impersonate-ui' into 'master'Rémy Coutable2018-03-051-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove impersonate token from flash scope in UI See merge request gitlab-org/gitlab-ce!17480
| * | | Remove impersonate token from flash scopejulien MILLAU2018-03-021-1/+0
| | | |
* | | | Merge branch 'fix/find-commit-with-empty-rev' into 'master'Robert Speicher2018-03-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep note commit around if commit_id is present Closes gitaly#1054 See merge request gitlab-org/gitlab-ce!17496
| * | | | Keep a commit around if its sha is presentAhmad Sherif2018-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | Closes gitaly#1054
* | | | | Merge branch 'kp-label-select-vue' into 'master'Phil Hughes2018-03-0532-10/+1231
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port Labels Select dropdown to Vue See merge request gitlab-org/gitlab-ce!17411
| * | | | | Add changelog entrykp-label-select-vueKushal Pandya2018-03-051-0/+5
| | | | | |
| * | | | | LabelsSelect DropdownValueCollapsed ComponentKushal Pandya2018-03-052-0/+122
| | | | | |
| * | | | | LabelsSelect DropdownValue ComponentKushal Pandya2018-03-052-0/+157
| | | | | |
| * | | | | LabelsSelect DropdownTitle ComponentKushal Pandya2018-03-052-0/+72
| | | | | |
| * | | | | LabelsSelect DropdownSearchInput ComponentKushal Pandya2018-03-052-0/+66
| | | | | |
| * | | | | LabelsSelect DropdownHiddenInput ComponentKushal Pandya2018-03-052-0/+59
| | | | | |
| * | | | | LabelsSelect DropdownHeader ComponentKushal Pandya2018-03-052-0/+57
| | | | | |
| * | | | | LabelsSelect DropdownFooter ComponentKushal Pandya2018-03-052-0/+76
| | | | | |
| * | | | | LabelsSelect DropdownCreateLabel ComponentKushal Pandya2018-03-052-0/+168
| | | | | |
| * | | | | LabelsSelect DropdownButton ComponentKushal Pandya2018-03-052-0/+160
| | | | | |
| * | | | | LabelsSelect Base ComponentKushal Pandya2018-03-052-0/+230
| | | | | |
| * | | | | LabelsSelectComponent tests mock dataKushal Pandya2018-03-051-0/+49
| | | | | |
| * | | | | Update path for ListLabel modelKushal Pandya2018-03-057-7/+7
| | | | | |
| * | | | | ListLabel Shared ModelKushal Pandya2018-03-051-3/+1
| | | | | |
| * | | | | Add `suggest_colors` from LabelsHelperKushal Pandya2018-03-051-0/+1
| | | | | |
| * | | | | Allow exposing methods to `gon_helper`Kushal Pandya2018-03-051-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '42572-release-controller' into 'master'Robert Speicher2018-03-057-82/+145
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Try not to hold env and release the controller after the request. See merge request gitlab-org/gitlab-ce!16847
| * | | | | Move constants and update for feedback42572-release-controllerLin Jen-Shin2018-03-034-18/+15
| | | | | |
View Lorry Controller Status