summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-delete-assignees-mysql' into 'master' Stan Hu2017-05-171-4/+9
* Merge branch 'fix_assignee_yourick_approach' into 'master'Douwe Maan2017-05-161-2/+2
* Merge branch '32030-transient-failure-in-spec-features-boards-boards_spec-rb'...Clement Ho2017-05-115-8/+33
* Merge branch 'enforce-current-user-usage-on-entities' into 'master' Kamil Trzciński2017-05-101-1/+1
* Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-105-14/+36
* Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-103-6/+18
* Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-103-3/+3
* Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-1010-81/+69
* Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-101-1/+1
* Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-101-9/+9
* Merge branch 'rs-sanitize-submodule-urls' into 'security'Douwe Maan2017-05-101-16/+30
* Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-101-6/+6
* remove carriage return complaints for rubocopRegis2017-05-091-1/+1
* Merge branch '26944-prometheus-memory-sparkline' into 'master' Fatih Acet2017-05-096-74/+179
* Merge branch 'mr-widget-redesign-review' into 'master'Jacob Schatz2017-05-09108-828/+3075
* Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' Sean McGivern2017-05-091-0/+9
* Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-081-6/+0
|\
| * remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-021-6/+0
* | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-071-7/+8
|\ \
| * | Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-071-7/+8
* | | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-0736-66/+728
* | | Move file loading to the top of the fileFilipa Lacerda2017-05-061-4/+4
* | | Adds missing CSS classFilipa Lacerda2017-05-061-0/+5
* | | Merge branch 'master' into 25226-realtime-pipelines-feFilipa Lacerda2017-05-0616-36/+112
|\ \ \ | |/ /
| * | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ...Kamil Trzciński2017-05-0615-34/+109
| |\ \
| | * | Do not reprocess actions when user retries pipelinefeature/gb/manual-actions-protected-branches-permissionsGrzegorz Bizon2017-05-051-0/+2
| | * | Require build to be present in the controllerGrzegorz Bizon2017-05-051-2/+1
| | * | Authorize build update on per object basisGrzegorz Bizon2017-05-052-7/+24
| | * | Use update build policy instead of new play policyGrzegorz Bizon2017-05-056-10/+12
| | * | Merge commit '3a2b60f7' from 'master'Grzegorz Bizon2017-05-05140-903/+2726
| | |\ \
| | * | | Improve environment policy classGrzegorz Bizon2017-05-031-5/+7
| | * | | Improve code style related to protected actionsGrzegorz Bizon2017-05-034-7/+7
| | * | | Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-0382-577/+1183
| | |\ \ \
| | * \ \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-02207-985/+2687
| | |\ \ \ \
| | * | | | | Fix Rubocop offense in environments policy classGrzegorz Bizon2017-05-011-1/+0
| | * | | | | Add new ability check for stopping environmentGrzegorz Bizon2017-05-012-8/+14
| | * | | | | Fix typo in CI/CD build partial viewGrzegorz Bizon2017-04-221-1/+1
| | * | | | | Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-04-22277-5103/+5887
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-04-13421-4150/+6738
| | |\ \ \ \ \ \
| | * | | | | | | Use build policy to determine if user can play buildGrzegorz Bizon2017-04-126-16/+5
| | * | | | | | | Do not inherit build policy in pipeline policyGrzegorz Bizon2017-04-122-1/+8
| | * | | | | | | Move code for playing an action to separate serviceGrzegorz Bizon2017-04-123-13/+21
| | * | | | | | | Implement new rule for manual actions in policiesGrzegorz Bizon2017-04-121-0/+14
| | * | | | | | | Check branch permission in manual action entityGrzegorz Bizon2017-04-061-0/+8
| | * | | | | | | Check if user can trigger manual action in the UIGrzegorz Bizon2017-04-061-1/+1
| | * | | | | | | Take branch access into account when stopping environmentGrzegorz Bizon2017-04-063-5/+13
| | * | | | | | | Expose manual action abilities from a build entityGrzegorz Bizon2017-04-061-3/+7
| | * | | | | | | Check branch access when user triggers manual actionGrzegorz Bizon2017-04-061-0/+10
| * | | | | | | | Merge branch 'fix/gb/hide-environment-external-url-btn-when-not-provided' int...Kamil Trzciński2017-05-061-2/+3
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge commit '3a2b60f7a' from 'master'fix/gb/hide-environment-external-url-btn-when-not-providedGrzegorz Bizon2017-05-05213-1471/+3900
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |