summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add-logging-to-rack-attack' into 'master' Douwe Maan2016-11-191-0/+7
|\
| * Add logging for rack attack eventsadd-logging-to-rack-attackBrian Neel2016-11-181-0/+7
* | Merge branch 'feature/precalculate-authorized-projects' into 'master' Douwe Maan2016-11-181-0/+1
|\ \ | |/ |/|
| * Precalculate user's authorized projects in databaseAhmad Sherif2016-11-181-0/+1
* | Improve consistency of empty todo list messagesRobert Speicher2016-11-181-7/+5
* | Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-181-0/+12
|\ \
| * | fix issue with commits and also updated routesJames Lopez2016-11-171-1/+1
| * | added the rest of the stages to the controller and relevant specsJames Lopez2016-11-171-1/+7
| * | added cycle analytics events controller and started integration specJames Lopez2016-11-171-0/+6
* | | Merge branch 'feature/subscribe-to-group-level-labels' into 'master' Sean McGivern2016-11-171-1/+4
|\ \ \
| * | | Add toggle_subscription action to Groups::LabelsControllerDouglas Barbosa Alexandre2016-11-171-1/+4
| | |/ | |/|
* | | Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-171-0/+6
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-168-24/+29
| |\ \
| * | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-161-0/+6
* | | | Merge branch 'mailroom_idle_timeout' into 'master' Rémy Coutable2016-11-172-1/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add idle_timeout to reply by email doc.Marin Jankovski2016-11-161-1/+1
| * | | Make mail_room idle_timeout option configurable.Marin Jankovski2016-11-162-1/+3
| | |/ | |/|
* | | Merge branch 'fix-shibboleth-auth-with-no-uid' into 'master' Rémy Coutable2016-11-161-0/+4
|\ \ \ | |/ / |/| |
| * | fix shibboleth misconfigurations resulting in authentication bypassfix-shibboleth-auth-with-no-uidBrian Neel2016-11-141-0/+4
| |/
* | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-152-0/+2
|\ \
| * | Add button to delete all merged branchesToon Claes2016-11-092-0/+2
* | | Merge branch 'issue-13823' into 'master' Alfredo Sumaran2016-11-142-0/+14
|\ \ \
| * | | Add new messagesJosep Llaneras2016-11-111-1/+5
| * | | Remove authorJosep Llaneras2016-11-111-11/+4
| * | | Issue #13823: random message when all Todos are DoneJosep Llaneras2016-11-112-0/+17
* | | | Fix typos and grammarseongahjo2016-11-141-2/+2
* | | | Merge branch 'user_filter_auth' into 'master' Rémy Coutable2016-11-141-16/+3
|\ \ \ \
| * | | | Centralize LDAP config/filter logicDrew Blessing2016-11-111-16/+3
| |/ / /
* | | | Merge branch 'repository-name-emojis' into 'master' Rémy Coutable2016-11-141-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Added ability to put emojis into repository nameVincent Composieux2016-11-121-6/+6
| | |/ | |/|
* | | Refactored initializer code to its own class and added testsPatricio Cano2016-11-101-7/+1
* | | Allow the Sidekiq queues to throttle and the factor by which to throttle them...Patricio Cano2016-11-101-12/+4
* | | Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-101-0/+16
|/ /
* | Merge branch 'dz-refactor-project-routes' into 'master' Dmitriy Zaporozhets2016-11-086-183/+176
|\ \
| * | Refactor project routingdz-refactor-project-routesDmitriy Zaporozhets2016-11-076-183/+176
| |/
* | Merge branch 'dz-refactor-namespace-regex' into 'master' Sean McGivern2016-11-082-23/+24
|\ \
| * | Refactor namespace regexdz-refactor-namespace-regexDmitriy Zaporozhets2016-11-072-23/+24
| |/
* | Merge branch 'sidekiq_default_retries' into 'master' Yorick Peterse2016-11-081-0/+3
|\ \
| * | Set default Sidekiq retries to 3Drew Blessing2016-11-041-0/+3
| |/
* | Merge branch 'dz-refactor-group-routes' into 'master' Dmitriy Zaporozhets2016-11-081-19/+19
|\ \
| * | Refactor group routingdz-refactor-group-routesDmitriy Zaporozhets2016-11-071-19/+19
| |/
* | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-082-0/+2
|\ \
| * | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-071-0/+1
| * | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-0/+1
| |/
* | Process commits in a separate workerprocess-commits-using-sidekiqYorick Peterse2016-11-071-0/+1
|/
* Update gitlab.yml.exampleElan Ruusamäe2016-11-021-1/+3
* Merge branch 'background-migrations' into 'master'Robert Speicher2016-11-011-0/+12
|\
| * Support for post deployment migrationsbackground-migrationsYorick Peterse2016-10-311-0/+12
* | Initialize Sidekiq with the list of queues used by GitLabsh-init-sidekiq-queuesStan Hu2016-11-011-0/+16
* | Merge branch 'blacklist-osl' into 'master' Robert Speicher2016-11-011-0/+7
|\ \
View Lorry Controller Status