summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-autoloading-issue' into 'master' Sean McGivern2016-12-131-1/+0
|\
| * Don't require `API::API` in routesfix-autoloading-issueRémy Coutable2016-12-121-1/+0
* | Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day)Jon Bailey2016-12-121-1/+1
|/
* Merge branch 'rs-filter-authentication_token' into 'security' Douwe Maan2016-12-082-2/+3
* Fix 404 error when visit group label edit pagedz-fix-group-label-404Dmitriy Zaporozhets2016-12-061-11/+11
* Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-011-0/+1
|\
| * Pipelines tabsFilipa Lacerda2016-11-301-0/+1
* | Merge branch 'fix-optimistic-locking-for-destroy' into 'master' Stan Hu2016-12-011-0/+17
|\ \
| * | Use Arel to avoid MySQL triple quotingfix-optimistic-locking-for-destroyLin Jen-Shin2016-12-011-2/+1
| * | Make deleting with optimistic locking respect NULLLin Jen-Shin2016-12-011-0/+18
| |/
* | Gracefully recover from Redis connection failures in Sidekiq initializerStan Hu2016-12-011-1/+1
|/
* Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern2016-11-291-0/+2
|\
| * Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-281-0/+2
* | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-247-158/+160
|\ \ | |/ |/|
| * Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-237-158/+160
* | Merge branch 'doc-for-config' into 'master' Achilleas Pipinellis2016-11-221-0/+22
|\ \ | |/ |/|
| * Update wordings by feedback from:doc-for-configLin Jen-Shin2016-06-231-7/+8
| * Add some clarification for some files under config/*Lin Jen-Shin2016-06-221-0/+21
* | Fix 404 on some group pages when name contains dotdz-fix-group-name-dotDmitriy Zaporozhets2016-11-211-3/+8
* | Merge branch '22539-display-folders' into 'master' Fatih Acet2016-11-191-0/+1
|\ \
| * \ Merge remote-tracking branch 'origin/master' into 22539-display-foldersKamil Trzcinski2016-11-187-9/+34
| |\ \
| * | | Includes page specific JSFilipa Lacerda2016-11-161-0/+1
* | | | 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
| |/ / / /
View Lorry Controller Status