summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '46049-import-export-import-is-broken-due-to-the-addition-of-a-c...Douwe Maan2018-05-041-1/+1
* [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
|\ \ \ \ \ \ \
| * | | | | | | Exclude LDAP from OmniauthCallbackController base methodsJames Edwards-Jones2018-04-302-4/+8
* | | | | | | | show only groups an admin is a member of in dashboards/gropsRoger Rüttimann2018-05-011-2/+6
* | | | | | | | Merge branch 'update-timeline-icon-for-description-edit' into 'master'Phil Hughes2018-05-011-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Update timeline icon for description editGeorge Tsiolis2018-05-011-3/+3
* | | | | | | | | Merge branch 'revert-discussion-counter-height' into 'master'Filipa Lacerda2018-04-302-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert discussion counter heightGeorge Tsiolis2018-05-012-5/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Fixed inconsistent protected branch pill baselineConstance Okoghenun2018-04-301-6/+5
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch '10-7-security_issue_42029' into 'security-10-7'Phil Hughes2018-04-301-1/+2
* | | | | | | | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-301-2/+3
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'ce-jej/branch-unprotection-disable-ui' into 'master'Grzegorz Bizon | OOO until May 7th2018-04-303-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Backports EE changes from disabling branch unprotect UIJames Edwards-Jones2018-04-253-3/+3
* | | | | | | Merge branch '45481-sane-pages-artifacts' into 'master'Kamil Trzciński2018-04-301-18/+11
|\ \ \ \ \ \ \
| * | | | | | | InvaildStateError -> InvalidStateErrorNick Thomas2018-04-271-9/+9
| * | | | | | | Don't automatically remove artifacts for pages jobs after pages:deploy has runNick Thomas2018-04-271-9/+2
* | | | | | | | Merge branch '45572-members-invitations-scheduled-before-commit' into 'master'Douwe Maan2018-04-302-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure member notifications are sent after the member actual creation/update ...Rémy Coutable2018-04-262-6/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'move-notification-service-calls-to-sidekiq' into 'master'Douwe Maan2018-04-3013-47/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | Move NotificationService calls to SidekiqSean McGivern2018-04-2513-47/+83
* | | | | | | | | Merge branch 'jramsay-44880-filter-pipelines-by-sha' into 'master'Kamil Trzciński2018-04-291-0/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add sha filter to list pipelinesJames Ramsay2018-04-271-0/+9
View Lorry Controller Status