summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add role="button"docs-fe-htmlClement Ho2018-03-091-0/+12
|
* Change from avoid to do not useClement Ho2018-03-091-1/+1
|
* Fix broken linkClement Ho2018-03-071-1/+1
|
* Improve html docsClement Ho2018-03-071-5/+5
|
* Add HTML style guideClement Ho2018-03-071-1/+39
|
* Merge branch 'docs-new-fe-guide' into 'master'Jacob Schatz2018-03-0718-0/+111
|\ | | | | | | | | Add new frontend guide structure See merge request gitlab-org/gitlab-ce!17611
| * Add new frontend guide structureClement Ho2018-03-0718-0/+111
| |
* | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-0758-118/+911
|\ \ | | | | | | | | | | | | | | | | | | Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
| * | Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-074-15/+33
| | | | | | | | | | | | | | | We only allow users that can merge the merge request to push to the fork.
| * | Link correct project when adding file to empty MRBob Van Landuyt2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | When creating a cross project merge request without changes. The MR widget shows the option to create a new file. It would however link to the wrong project.
| * | Use Project#source_of_merge_requests-relationBob Van Landuyt2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | Using the relation `Project#source_of_merge_requests` in `Ci::CreatePipelineService` That way we take advantage of all the `ActiveRecord::Relation` magic
| * | Limit queries to a user-branch combinationBob Van Landuyt2018-03-078-65/+109
| | | | | | | | | | | | | | | The query becomes a lot simpler if we can check the branch name as well instead of having to load all branch names.
| * | Add documentation for allowing maintainers to pushBob Van Landuyt2018-03-076-3/+18
| | |
| * | Set `allow_maintainer_to_push` using the APIBob Van Landuyt2018-03-075-30/+65
| | |
| * | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-0719-79/+247
| | |
| * | Allow maintainers to push to a single branchBob Van Landuyt2018-03-072-1/+40
| | |
| * | Allow abilities on forks while MR is openBob Van Landuyt2018-03-076-3/+138
| | | | | | | | | | | | | | | | | | | | | | | | When an MR is created using `allow_maintainer_to_push`, we enable some abilities while the MR is open. This should allow every user with developer abilities on the target project, to push to the source project.
| * | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-0722-4/+324
| | | | | | | | | | | | | | | | | | When a project is not private, and the source branch not protected the user can now select the option to allow maintainers to push to this branch
| * | Add `allow_maintainer_to_push` to `merge_requests`Bob Van Landuyt2018-03-072-0/+19
| | | | | | | | | | | | | | | This flag will allow maintainers of a project to push to specific branches of a fork of a project
* | | Merge branch 'pages-0-7-0' into 'master'Grzegorz Bizon2018-03-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update GitLab Pages to v0.7.0 See merge request gitlab-org/gitlab-ce!17603
| * \ \ Merge branch 'master' into 'pages-0-7-0'Grzegorz Bizon2018-03-0740-172/+700
| |\ \ \ | | | | | | | | | | | | | | | Conflicts: GITLAB_PAGES_VERSION
| * | | | Update GitLab Pages to v0.7.0Nick Thomas2018-03-071-1/+1
| | | | |
* | | | | Merge branch '39444-make-margin-around-dropdown-dividers-4px' into 'master'Clement Ho2018-03-072-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make margin around dropdown dividers 4px" Closes #39444 See merge request gitlab-org/gitlab-ce!17517
| * | | | | Set margins around dropdown dividers to 4px (based on grid)39444-make-margin-around-dropdown-dividers-4pxLukas Eipert2018-03-052-1/+6
| | | | | |
* | | | | | Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'Robert Speicher2018-03-072-6/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce number of FindCommit calls from RefsController#logs_tree Closes gitaly#1057 See merge request gitlab-org/gitlab-ce!17566
| * | | | | | Reduce number of FindCommit calls from RefsController#logs_treefix/reduce-number-of-find-commit-for-log-treeAhmad Sherif2018-03-062-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitaly#1057 The old code was calling LastCommitForPath to extract a commit ID _then_ call FindCommit to get a commit it already had in the first place!
* | | | | | | Merge branch '4326-fix-js-or-true' into 'master'Clement Ho2018-03-071-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a JS bug in the websocket terminal See merge request gitlab-org/gitlab-ce!17470
| * | | | | | | Fix a JS bug in the websocket terminalNick Thomas2018-03-071-2/+8
| | | | | | | |
* | | | | | | | Merge branch 'patch-28-docs' into 'master'Robert Speicher2018-03-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to Pacific Time Zone [ci skip] See merge request gitlab-org/gitlab-ce!17600
| * | | | | | | | Change to Pacific Time ZoneFabien Catteau2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The freeze time remains the same when switching to PDT (Daylight Saving Time), so it should be PT, not PST.
* | | | | | | | | Merge branch 'fix/upgrade-grpc-to-1-1-0' into 'master'Robert Speicher2018-03-072-11/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade grpc gem to 1.10.0 See merge request gitlab-org/gitlab-ce!17575
| * | | | | | | | Upgrade grpc gem to 1.10.0fix/upgrade-grpc-to-1-1-0Ahmad Sherif2018-03-062-11/+9
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Related to gitaly#1060
* | | | | | | | Merge branch 'upgrade-workhorse-4.0.0' into 'master'Nick Thomas2018-03-072-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Workhorse to 4.0.0 See merge request gitlab-org/gitlab-ce!17606
| * | | | | | | | Upgrade Workhorse to 4.0.0upgrade-workhorse-4.0.0Kamil Trzciński2018-03-072-1/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-0719-105/+635
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve: Modal and banner designs for project label and project milestone promotion Closes #41895 See merge request gitlab-org/gitlab-ce!17197
| * | | | | | | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-0614-96/+36
| | | | | | | | | |
| * | | | | | | | | Add persistent flash messagesJose Ivan Vargas2018-03-019-9/+73
| | | | | | | | | |
| * | | | | | | | | Changed selector names, address code concernsJose Ivan Vargas2018-03-0113-185/+183
| | | | | | | | | |
| * | | | | | | | | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-0119-97/+625
| | | | | | | | | |
* | | | | | | | | | Merge branch 'doc-api-fix' into 'master'Sean McGivern2018-03-072-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor fixes in API doc See merge request gitlab-org/gitlab-ce!17602
| * | | | | | | | | | Minor fixes in API docJan Provaznik2018-03-072-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'dz-use-less-deprecated-methods-2' into 'master'Douwe Maan2018-03-079-11/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Project#full_name instead of name_with_namespace See merge request gitlab-org/gitlab-ce!17601
| * | | | | | | | | | | Use Project#full_name instead of name_with_namespaceDmitriy Zaporozhets2018-03-079-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | Merge branch 'gitaly-git-mandatory' into 'master'Douwe Maan2018-03-073-51/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make git push mandatory See merge request gitlab-org/gitlab-ce!17565
| * | | | | | | | | | | | naming thingsKim "BKC" Carlbäcker2018-03-071-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix specsgitaly-git-mandatoryKim "BKC" Carlbäcker2018-03-071-26/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Make git push mandatoryKim "BKC" Carlbäcker2018-03-062-25/+4
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-075-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'sh-fix-otp-backup-cherry-pick' into 'master'James Lopez2018-03-073-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'master' See merge request gitlab/gitlabhq!2349
| | * | | | | | | | | | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-073-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324