summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Hide environment external URL button if not definedGrzegorz Bizon2017-05-021-2/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-066-8/+93
* | | | | | | Merge branch 'fix-routable-find-by-full-path-on-mysql' into 'master' Sean McGivern2017-05-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix `Routable.find_by_full_path` on MySQLfix-routable-find-by-full-path-on-mysqlSean McGivern2017-05-061-1/+1
* | | | | | | | Merge branch '23751-add-contribution-graph-key-tooltips' into 'master' Filipa Lacerda2017-05-061-9/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | add tooltips to user contrib graph keyMike Greiling2017-05-051-9/+17
* | | | | | | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-0610-74/+150
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Reduce risk of deadlocks17361-redirect-renamed-pathsMichael Kozono2017-05-051-7/+17
| * | | | | | | Resolve discussionsMichael Kozono2017-05-052-7/+6
| * | | | | | | Resolve discussionsMichael Kozono2017-05-054-25/+20
| * | | | | | | Dry up routable lookups. Fixes #30317Michael Kozono2017-05-054-51/+54
| * | | | | | | Add “project moved” flash message on redirectMichael Kozono2017-05-051-0/+1
| * | | | | | | Resolve discussionsMichael Kozono2017-05-053-20/+22
| * | | | | | | RefactorMichael Kozono2017-05-052-9/+9
| * | | | | | | Delete conflicting redirectsMichael Kozono2017-05-052-7/+16
| * | | | | | | Create redirect routes on path changeMichael Kozono2017-05-051-7/+17
| * | | | | | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-059-27/+74
* | | | | | | | Colorize labels in issue search fieldWinnie Hellmann2017-05-059-7/+95
* | | | | | | | Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-g...Sean McGivern2017-05-052-14/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ceAlejandro Rodríguez2017-05-052-1/+8
| * | | | | | | | Allow gl-repository strings as project identifiers in PostReceive workerAlejandro Rodríguez2017-05-051-13/+18
* | | | | | | | | Merge branch 'fix/admin-integrations' into 'master' Sean McGivern2017-05-053-0/+126
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refactor code based on feedbackfix/admin-integrationsJames Lopez2017-05-052-8/+6
| * | | | | | | | | refactor code based on feedbackJames Lopez2017-05-052-2/+2
View Lorry Controller Status