summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Improved confirmation UXconfirmation-screenPhil Hughes2016-04-212-2/+11
| | | | Closes #4228
* Merge branch 'label-text-color-sidebar' into 'master' Robert Speicher2016-04-212-2/+2
|\ | | | | | | | | | | | | | | | | Fixes text color on labels in sidebar Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color. With this, the text color comes from the JSON. See merge request !3846
| * Fixes text color on labels in sidebarPhil Hughes2016-04-212-2/+2
| |
* | Merge branch 'remove-update-files' into 'master' Yorick Peterse2016-04-212-2/+0
|\ \ | | | | | | | | | | | | Removed JS update templates See merge request !3814
| * | Removed JS update templatesremove-update-filesPhil Hughes2016-04-192-2/+0
| | |
* | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show project members only for members fixes #5838 See merge request !3752
| * | | Remove unused authorization from controllerFelipe Artur2016-04-201-5/+0
| | | |
| * | | Show project members only for membersFelipe Artur2016-04-181-1/+6
| |/ /
* | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-212-5/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
| * \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-195-14/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-168-36/+80
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | Optimise Merge Request builds renderingKamil Trzcinski2016-04-131-2/+0
| | | | | |
| * | | | | Cleanup changesKamil Trzcinski2016-04-131-0/+0
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-138-46/+67
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-111-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/commits/_commit.html.haml
| * | | | | | | Fix specsKamil Trzcinski2016-04-111-2/+6
| | | | | | | |
| * | | | | | | Use Ci::Commit as PipelineKamil Trzcinski2016-04-113-3/+7
| | | | | | | |
* | | | | | | | Add due_date:time field to Issue modelMehmet Beydogan2016-04-201-1/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add due_date text field to sidebar issue#show Add ability sorting issues by due date ASC and DESC Add ability to filtering issues by No Due Date, Any Due Date, Due to tomorrow, Due in this week options Add handling issue due_date field for MergeRequest Update CHANGELOG Fix ambigous match for issues#show sidebar Fix SCREAMING_SNAKE_CASE offenses for due date contants Add specs for due date sorting and filtering on issues
* | | | | | | Merge branch 'multi-filter-labels' into 'master' Jacob Schatz2016-04-202-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutliple label filter Fixes #989 See merge request !3438
| * | | | | | | Label text color comes from JSONPhil Hughes2016-04-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created issuable singleton to house the filtering
| * | | | | | | get the multi filter labels feature to work on merge request, also escape ↵Arinde Eniola2016-04-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | characters in the templates to prevent xss attack
| * | | | | | | Filter by multiple labels with little animation.Jacob Schatz2016-04-131-2/+3
| | | | | | | |
* | | | | | | | Merge branch 'slack_wiki_notifications' into 'master' Rémy Coutable2016-04-202-15/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add slack notifications for wiki pages ## What does this MR do? Lets the Slack service be configured to send notifications when wiki pages are created or edited. ## Are there points in the code the reviewer needs to double check? I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :) ## Why was this MR needed? Related to #563 and fixes #4233. See merge request !2998
| * | | | | | | | improve check if wiki page is persistedSebastian Klier2016-04-201-1/+1
| | | | | | | | |
| * | | | | | | | remove unnecessary methodsSebastian Klier2016-04-201-11/+0
| | | | | | | | |
| * | | | | | | | add slack notifications for wiki pagesSebastian Klier2016-04-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update changelog
* | | | | | | | | Use Rails-way to send file by X-SendfileTomasz Maczukin2016-04-191-5/+2
| | | | | | | | |
* | | | | | | | | Add feature specs for raw traceTomasz Maczukin2016-04-191-1/+1
| | | | | | | | |
* | | | | | | | | Switch raw trace to use X-Sendfile headerTomasz Maczukin2016-04-191-3/+6
| | | | | | | | |
* | | | | | | | | Add raw trace output for GitLab WorkhorseTomasz Maczukin2016-04-191-1/+9
|/ / / / / / / /
* | | | | | | | Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-191-13/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Add support to cherry-pick any commitP.S.V.R2016-04-181-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* | | | | | | | | Merge branch '14566-confidential-issue-branches' into 'master' Robert Speicher2016-04-191-4/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitize branch names for confidential issues - When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`. - The behaviour for non-confidential issues stays the same. Closes #14566 See merge request !3671
| * | | | | | | | | Remove unused variable in `IssuesController`.Timothy Andrew2016-04-181-2/+0
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into ↵Timothy Andrew2016-04-157-34/+64
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14566-confidential-issue-branches
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵Timothy Andrew2016-04-137-45/+67
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14566-confidential-issue-branches
| * | | | | | | | | | | Refactor `Issue#related_branches`Timothy Andrew2016-04-121-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Previously, the controller held the logic to calculate related branches, which was: `<branches ending with `issue.iid`> - <branches with a merge request referenced in the current issue>` - This logic belongs in the `related_branches` method, not in the controller. This commit makes this change. - This means that `Issue#related_branches` now needs to take a `User`. When we find the branches that have a merge request referenced in the current issue, this is limited to merge requests that the current user has access to. - This is not directly related to #14566, but is a related refactoring.
* | | | | | | | | | | Configuring of points per UDP packettoggle-points-per-packetYorick Peterse2016-04-191-0/+1
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to configure the number of points stored in a single UDP packet. This in turn can be used to reduce the number of UDP packets being sent at the cost of these packets being somewhat larger. The default setting is 1 point per packet so nothing changes for existing users.
* | | | | | | | | | Merge branch 'configurable-shared-runners-text' into 'master' Kamil Trzciński2016-04-191-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add configurable shared runners text cc @axil @rspeicher @grzesiek See merge request !3750
| * | | | | | | | | | Add configurable shared runners textKamil Trzcinski2016-04-181-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/link-group-permissions' into 'master' Douwe Maan2016-04-191-4/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check permissions when sharing project with group ## Summary Unprivileged user was able to share project with group he didn't have access to, and therefore gain partial access to that group, which opened possibilities for further actions like listing private projects in that group. See https://gitlab.com/gitlab-org/gitlab-ce/issues/15330 ## Fix This change introduces additional check for group read access. ## Further work We can think about preventing such problems in the future (this is quite common problem) by moving permissions checks to another layer of abstraction (TBD). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15330 See merge request !1949
| * | | | | | | | | | Use guard clause to check ability to share projectGrzegorz Bizon2016-04-191-7/+4
| | | | | | | | | | |
| * | | | | | | | | | Refactor method that shares project with a groupGrzegorz Bizon2016-04-191-4/+3
| | | | | | | | | | |
| * | | | | | | | | | Check permissions when sharing project with groupGrzegorz Bizon2016-04-191-4/+10
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15330
* | | | | | | | | | Add push events to permit params in system hooksdz/system-hooks-uiDmitriy Zaporozhets2016-04-191-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Remove group members checkFelipe Artur2016-04-181-7/+0
| | | | | | | | |
* | | | | | | | | Code fixesFelipe Artur2016-04-182-18/+10
| | | | | | | | |
* | | | | | | | | Fix codeFelipe Artur2016-04-182-5/+5
| | | | | | | | |
* | | | | | | | | Add specs and fix codeFelipe Artur2016-04-181-1/+1
| | | | | | | | |
* | | | | | | | | Move verification to abilitiesFelipe Artur2016-04-183-3/+19
| | | | | | | | |