summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Gitlab::Checks is now instrumentedPaco Guzman2016-09-131-1/+2
* Merge branch 'rails-5-backports' into 'master' Robert Speicher2016-09-121-6/+2
|\
| * No need for this variable.Connor Shea2016-09-121-6/+1
| * Remove x-json mime_type, rename to json_mime_types.rails-5-backportsConnor Shea2016-09-111-3/+2
| * Fix two problematic bits of code that will be deprecated or broken in Rails 5.Connor Shea2016-09-051-6/+8
* | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-091-0/+8
|\ \
| * | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-051-0/+8
| |/
* | Make merge requests bulk update workingDmitriy Zaporozhets2016-09-081-0/+1
* | Limited amount of pruned Event rows per runOlaf Tomalka2016-09-071-1/+1
* | Added cron to prune events older than 12 months.Olaf Tomalka2016-09-071-0/+3
|/
* Merge branch 'fix-sidekiq-sentry-context' into 'master' Robert Speicher2016-08-311-0/+1
|\
| * Fix Sentry not reporting right program for Sidekiq workersfix-sidekiq-sentry-contextStan Hu2016-08-251-0/+1
* | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-262-7/+1
|\ \ | |/
| * Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-252-7/+1
* | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-244-0/+70
|\ \ | |/
| * Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-221-0/+57
| * Support integration with Koding (online IDE)Gokmen Goksel2016-08-191-0/+5
| * Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-191-0/+6
| |\
| | * Fix cron job keyexpiration-date-on-membershipsDouwe Maan2016-08-191-3/+3
| | * Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-192-0/+10
| | |\
| | * \ Merge branch 'master' into expiration-date-on-membershipsDouwe Maan2016-08-181-1/+2
| | |\ \
| | * \ \ Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-181-0/+2
| | |\ \ \
| | * | | | Allow project group links to be expiredSean McGivern2016-08-181-0/+3
| | * | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1814-100/+219
| | |\ \ \ \
| | * | | | | Add worker which removes expired members.Adam Niedzielski2016-08-041-0/+3
| * | | | | | Merge branch 'ace-ventura' into 'master' Jacob Schatz2016-08-191-0/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Only load Ace on Snippets and file edit pages.Connor Shea2016-08-181-0/+2
| | | |_|/ / | | |/| | |
* | | | | | Path could also have slashes! Feedback:Lin Jen-Shin2016-08-241-3/+2
* | | | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-193-1/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-192-0/+10
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-181-0/+2
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-172-0/+19
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-161-2/+15
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1212-91/+169
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-034-7/+16
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-07-285-25/+37
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Correctly resolves/unresolves discussionsPhil Hughes2016-07-261-1/+1
| | * | | | | | | convert CS to JSPhil Hughes2016-07-261-1/+1
| | * | | | | | | Merge branch 'master' into diff-line-comment-vuejsPhil Hughes2016-07-263-2/+16
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add endpoints to resolve diff notes and discussionsDouwe Maan2016-07-251-4/+8
| | * | | | | | | | Resolve all endpointPhil Hughes2016-07-241-0/+4
| | * | | | | | | | Posts to rails to update note eventuallyPhil Hughes2016-07-241-0/+1
| | * | | | | | | | Diff line comments resolvePhil Hughes2016-07-241-0/+1
| * | | | | | | | | Small refactor and syntax fixes.2fa-api-checkPatricio Cano2016-08-181-1/+1
| * | | | | | | | | Removed unnecessary service for user retrieval and improved API error message.Patricio Cano2016-08-181-1/+2
| * | | | | | | | | Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner P...Patricio Cano2016-08-181-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-181-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Allow naming U2F devices.Timothy Andrew2016-08-181-0/+2
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-182-0/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-172-0/+16
| |\ \ \ \ \ \ \
View Lorry Controller Status