summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi...Matija Čupić2018-05-0226-98/+126
|\
| * Merge branch 'revert-75f6e91f' into 'master'Phil Hughes2018-05-022-2/+9
| |\
| | * Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'"Rémy Coutable2018-05-022-2/+9
| * | Merge branch '45761-replace-actionview-time_ago_in_words' into 'master'Rémy Coutable2018-05-0213-17/+13
| |\ \
| | * | Replace time_ago_in_words with JS-based oneTakuya Noguchi2018-04-2713-17/+13
| * | | Merge branch 'increase-new-issue-metadata-form-margin' into 'master'Clement Ho2018-05-022-2/+3
| |\ \ \
| | * | | Increase new issue metadata form marginGeorge Tsiolis2018-04-302-2/+3
| * | | | Merge branch 'jprovazn-generic-error' into 'master'Nick Thomas2018-05-021-10/+19
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Save and expose only generic merge errorJan Provaznik2018-05-021-10/+19
| | |/ /
| * | | Merge branch 'refactor/move-mr-widget-wip-vue-component' into 'master'Mike Greiling2018-05-023-38/+47
| |\ \ \
| | * | | Move WorkInProgress vue componentGeorge Tsiolis2018-04-163-38/+47
| * | | | Merge branch 'refactor/move-sidebar-time-tracking-vue-component' into 'master'Filipa Lacerda2018-05-022-17/+20
| |\ \ \ \
| | * | | | Move SidebarTimeTracking vue componentGeorge Tsiolis2018-05-022-17/+20
| * | | | | Merge branch 'refactor/move-no-tracking-pane-vue-component' into 'master'Phil Hughes2018-05-023-12/+15
| |\ \ \ \ \
| | * | | | | Move TimeTrackingNoTrackingPane vue componentGeorge Tsiolis2018-05-023-12/+15
| | |/ / / /
* | | | | | Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi...Matija Čupić2018-05-0242-181/+427
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '5480-sidebar-subscription-event-handling' into 'master'Phil Hughes2018-05-022-9/+2
| |\ \ \ \ \
| | * | | | | Consume `toggleSubscription` event directly from Subscriptions componentKushal Pandya2018-05-021-7/+1
| | * | | | | Emit `toggleSubscription` event on component instead of eventHubKushal Pandya2018-05-021-2/+1
| * | | | | | Merge branch 'improve-quick-actions-summary-preview' into 'master'Tim Zallmann2018-05-021-0/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Improve quick actions summary previewGeorge Tsiolis2018-05-011-0/+10
| * | | | | | [Rails5] Fix enum question mark methodsblackst0ne2018-05-022-0/+18
| * | | | | | Display and revoke active sessionsAlexis Reigel ( 🌴 may 2nd - may 9th 🌴 )2018-05-028-30/+209
| * | | | | | Merge branch 'blackst0ne-rails5-add-touch-later-to-commit-model' into 'master'Rémy Coutable2018-05-021-0/+6
| |\ \ \ \ \ \
| | * | | | | | [Rails5] Add `touch_later` to `Commit` modelblackst0ne2018-04-291-0/+6
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'blackst0ne-rails5-use-safe-params-instead-of-params-in-url-for-...Rémy Coutable2018-05-025-5/+5
| |\ \ \ \ \ \
| | * | | | | | [Rails5] Use `safe_params` instead of `params` in `url_for` helpersblackst0ne2018-04-285-5/+5
| | |/ / / / /
| * | | | | | Merge branch 'blackst0ne-rails5-update-application-controller-log-exception' ...Rémy Coutable2018-05-021-1/+2
| |\ \ \ \ \ \
| | * | | | | | [Rails5] Update `ApplicationController#log_exception` to fix `undefined metho...blackst0ne2018-04-281-1/+2
| | |/ / / / /
| * | | | | | Merge branch 'make-job-lfs-artifacts-read-only' into 'master'Douwe Maan2018-05-023-4/+3
| |\ \ \ \ \ \
| | * | | | | | Fix file_store for artifacts and lfs when savingKamil Trzciński2018-05-013-4/+3
| * | | | | | | Merge branch 'blackst0ne-rails5-fix-delete-user-worker' into 'master'Rémy Coutable2018-05-021-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [Rails5] Fix `params` for DeleteUserWorkerblackst0ne2018-04-281-1/+1
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'jr-33320-lfs-settings-interface' into 'master'Douwe Maan2018-05-022-28/+26
| |\ \ \ \ \ \ \
| | * | | | | | | Enable LFS setting UI for Masters and OwnersJames Ramsay2018-05-012-28/+26
| * | | | | | | | Merge branch 'backstage/gb/migrate-pipeline-stages-index' into 'master'Kamil Trzciński2018-05-022-4/+18
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Use stages position column to track stage indexGrzegorz Bizon2018-05-012-4/+4
| | * | | | | | | Merge branch 'master' into backstage/gb/migrate-pipeline-stages-indexGrzegorz Bizon2018-05-0175-391/+481
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into 'backstage/gb/migrate-pipeline-stages-index'Grzegorz Bizon2018-04-2543-178/+762
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Rename stage index column name to priority columnGrzegorz Bizon2018-04-242-4/+4
| | * | | | | | | | | Use database query to calculate average stage positionGrzegorz Bizon2018-04-241-5/+7
| | * | | | | | | | | Ensure that an imported pipeline stage can be updatedGrzegorz Bizon2018-04-241-1/+9
| | * | | | | | | | | Validate presence of a stage index in the modelGrzegorz Bizon2018-04-242-3/+7
| * | | | | | | | | | Merge branch 'dm-commit-trailer-without-gravatar' into 'master'Robert Speicher2018-05-014-75/+76
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Make avatar helpers available to emailsDouwe Maan2018-04-261-0/+1
| | * | | | | | | | | | Fix commit trailer rendering when Gravatar is disabledDouwe Maan2018-04-253-75/+75
| * | | | | | | | | | | Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master'Douwe Maan2018-05-011-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Use persisted diff data instead fetching Git on discussionsOswaldo Ferreira2018-04-301-1/+14
| * | | | | | | | | | | Merge request and commit discussions APIJan Provaznik2018-05-013-3/+14
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'jej/exclude-group-saml-buttons' into 'master'Douwe Maan2018-05-012-4/+8
| |\ \ \ \ \ \ \ \ \ \