summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-071-4/+3
|
* issue note storeSimon Knox2017-11-301-1/+1
|
* Merge branch '40642-members-tab-not-signed-in' into 'master'Mike Greiling2017-11-301-1/+1
|\ | | | | | | | | | | | | Add project_members controller when not signed in Closes #40642 See merge request gitlab-org/gitlab-ce!15659
| * Add project_members controller when not signed in40642-members-tab-not-signed-inAnnabel Dunstone Gray2017-11-291-1/+1
| |
* | Merge branch '13634-broadcast-message' into 'master'Tim Zallmann2017-11-301-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix broadcast message not showing up on login page Closes #13634 See merge request gitlab-org/gitlab-ce!15578
| * | Fix broadcast message not showing up on login pageKushal Pandya2017-11-281-1/+2
| | |
* | | Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master'Grzegorz Bizon2017-11-303-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector. See merge request gitlab-org/gitlab-ce!15515
| * | | Aling shared_exmaples to "same behavior between KubernetesService and ↵Shinya Maeda2017-11-281-1/+1
| | | | | | | | | | | | | | | | Platform::Kubernetes"
| * | | Replce kubernetes_service and deployment_service to deployment_platformShinya Maeda2017-11-283-3/+3
| |/ /
* | | Merge branch '39455-clone-dropdown-should-not-have-a-tooltip' into 'master'Tim Zallmann2017-11-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clone dropdown should not have a tooltip" Closes #39455 See merge request gitlab-org/gitlab-ce!15334
| * | | Change dropdown button background colorJose Ivan Vargas2017-11-271-1/+1
| |/ /
* | | Remove blank flash messages caused by nil40671-fix-empty-blank-flash-messagesEric Eastwood2017-11-291-3/+5
| |/ |/| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40671 See https://gitlab.com/gitlab-org/gitlab-ce/blob/f7254a4060b30e3134c6cf932eaba0fc8e249e9a/app/controllers/sessions_controller.rb#L42 for an example of where we set `flash[:notice] = nil`
* | Merge branch 'bvl-double-fork' into 'master'Phil Hughes2017-11-292-16/+27
|\ \ | | | | | | | | | | | | Redirect to an already forked project if it exists See merge request gitlab-org/gitlab-ce!15653
| * | Redirect to an already forked project if it existsBob Van Landuyt2017-11-292-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | Before the we would try to `POST` to the project path, which would result in a 404, because that `POST` is not supported. By changing this back to a normal link, not not handled in JS, we can immeadiatly redirect.
* | | Merge branch 'multi-file-editor-css-fixes' into 'master'Tim Zallmann2017-11-292-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Added IDE commit panel Closes #40041 See merge request gitlab-org/gitlab-ce!15583
| * | Added IDE commit panelPhil Hughes2017-11-242-1/+2
| |/ | | | | | | Closes #40041
* | Merge branch 'events-atom-feed-author-query' into 'master'Douwe Maan2017-11-291-1/+6
|\ \ | | | | | | | | | | | | Reuse authors when rendering event Atom feeds See merge request gitlab-org/gitlab-ce!15630
| * | Reuse authors when rendering event Atom feedsevents-atom-feed-author-queryYorick Peterse2017-11-281-1/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | Previously we'd use "event.author_email" which translates to "event.author.email". This would result in an extra query being executed _for every event_ just to get the same author's Email address. Instead of doing all this useless work we can just pass the User object returned by "event.author" since: 1. This allows us to re-use the user object's Email address. 2. Authors are eager-loaded, so this doesn't cause any N+1 queries.
* | Merge branch ↵Sean McGivern2017-11-291-22/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '21143-customize-branch-name-when-using-create-branch-in-an-issue' into 'master' Resolve "Customize branch name when using create branch in an issue" Closes #21143 See merge request gitlab-org/gitlab-ce!13884
| * | Add an ability to use a custom branch name on creation from issuesVitaliy @blackst0ne Klachkov2017-11-251-22/+38
| | |
* | | Add timeouts for Gitaly callsAndrew Newdigate2017-11-291-0/+24
| | |
* | | Merge branch ↵Kamil Trzciński2017-11-282-16/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings' into 'master' Add checkbox to automatically run a pipeline when Auto DevOps is turned on in project settings Closes #38962 See merge request gitlab-org/gitlab-ce!15380
| * | | Add checkboxes to automatically run AutoDevops pipelineEric Eastwood2017-11-282-16/+22
| | |/ | |/| | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
* | | Merge branch '40459-svg-icon-fix' into 'master'Annabel Dunstone Gray2017-11-282-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Resolve "Issue note icons wrong color" Closes #40459 See merge request gitlab-org/gitlab-ce!15561
| * | override a:focus styles. fix Commit page pipeline icon40459-svg-icon-fixSimon Knox2017-11-231-2/+2
| | |
| * | fix some icon colors. move text-color styles to common.scssSimon Knox2017-11-231-1/+1
| | |
* | | Prevent 500 error when inspecting job after trigger was removedFilipa Lacerda2017-11-241-3/+4
| | |
* | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan2017-11-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move identical merged branch check to merged_branch_names Closes #39887 See merge request gitlab-org/gitlab-ce!15464
| * | | Move identical merged branch check to merged_branch_namesLin Jen-Shin2017-11-231-1/+1
| | | |
* | | | Allow password authentication to be disabled entirelyMarkus Koller2017-11-239-16/+29
| | | |
* | | | Improve environments performanceFilipa Lacerda2017-11-232-4/+4
|/ / /
* | | Merge branch '39653-hide-section_start-and-section_end-in-pipeline-emails' ↵Filipa Lacerda2017-11-231-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Hide `section_start` and `section_end` in pipeline emails" Closes #39653 See merge request gitlab-org/gitlab-ce!15534
| * | | Add CSS hidden class in mailer layout39653-hide-section_start-and-section_end-in-pipeline-emailsAlessio Caiazza2017-11-221-0/+4
| | | |
* | | | Change star, filter and settings icons to the their sprite based replacementsJose Ivan Vargas Lopez2017-11-232-4/+4
| | | |
* | | | Add edit button to mobile file viewTravis Miller2017-11-221-1/+1
| | | |
* | | | Merge branch 'group-new-miletone-breadcrumb' into 'master'Filipa Lacerda2017-11-221-1/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fixed new group milestone breadcrumb Closes #40338 See merge request gitlab-org/gitlab-ce!15511
| * | | Fixed new group milestone breadcrumbPhil Hughes2017-11-221-1/+0
| | | | | | | | | | | | | | | | Closes #40338
* | | | Merge branch '39720-group-milestone-sorting' into 'master'Sean McGivern2017-11-221-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Add Group Milestone sorting Closes #39720 See merge request gitlab-org/gitlab-ce!15230
| * | | Add group milestone to feature spec and minor changesGeorge Andrinopoulos2017-11-072-23/+1
| | | |
| * | | Add Group Milestone sortingGeorge Andrinopoulos2017-11-072-0/+23
| | | |
* | | | Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-211-1/+2
| | | |
* | | | Merge branch '40377-blank-states' into 'master'Annabel Dunstone Gray2017-11-211-8/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix blank states using old css Closes #40377 See merge request gitlab-org/gitlab-ce!15521
| * | | | Fix blank states using old css40377-blank-statesFilipa Lacerda2017-11-211-8/+9
| | | | |
* | | | | Merge branch 'dz-improve-help-page' into 'master'Annabel Dunstone Gray2017-11-211-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add wiki css to help page See merge request gitlab-org/gitlab-ce!15488
| * | | | Add wiki css to help pageDmitriy Zaporozhets2017-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Use the correct i18n helper for namespaced string40367-tagspage-tagsRémy Coutable2017-11-211-1/+1
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '39821-fix-commits-list-with-multi-file-editor' into 'master'Phil Hughes2017-11-211-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix commits list 500 with multi-file editor new_repo cookie Closes #39821 See merge request gitlab-org/gitlab-ce!15502
| * | | Fix commits list 500 with multi-file editor new_repo cookie39821-fix-commits-list-with-multi-file-editorEric Eastwood2017-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39821 /<namespace>/<project>/commmits/master
* | | | Merge branch '39497-inline-edit-issue-on-mobile' into 'master'Annabel Dunstone Gray2017-11-202-15/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add inline editing to issues on mobile Closes #39497 See merge request gitlab-org/gitlab-ce!15438
| * | | | Add inline editing to issues on mobileEric Eastwood2017-11-182-15/+13
| | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39497