summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Fix rubocop failureszj-mattermost-sessionKamil Trzcinski2016-12-171-2/+2
* Store mattermost_url in settingsKamil Trzcinski2016-12-172-0/+13
* Merge branch 'bitbucket-oauth2' into 'master' Douglas Barbosa Alexandre2016-12-162-2/+6
|\
| * Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-165-3/+13
| |\
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-141-7/+16
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-148-16/+34
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-309-158/+184
| |\ \ \ \
| * | | | | Remove code to clone Bitbucket repositories using SSHDouglas Barbosa Alexandre2016-11-211-2/+0
| * | | | | Add custom OmniAuth strategy for Bitbucket OAuth2Douglas Barbosa Alexandre2016-11-211-0/+6
* | | | | | Merge branch '18435-autocomplete-is-not-performant' into 'master' Fatih Acet2016-12-161-1/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Changed autocomplete_sources into an action that returns a single 'at' type o...18435-autocomplete-is-not-performantLuke Bennett2016-12-151-1/+12
| | |_|_|/ | |/| | |
* | | | | Calls to the API are checked for scope.Timothy Andrew2016-12-162-2/+3
* | | | | Merge branch 'rs-filter-params' into 'security' bpj-issuable-sidebar-autoupdatebackport-link_to_member_avatarRémy Coutable2016-12-151-1/+3
* | | | | Merge branch 'katex-math' into 'master' Sean McGivern2016-12-152-0/+4
|\ \ \ \ \
| * | | | | Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-142-0/+4
* | | | | | Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-151-0/+3
| |/ / / / |/| | | |
* | | | | Merge branch 'dz-fix-admin-routes' into 'master' Sean McGivern2016-12-141-7/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add support for nested groups to admin routingdz-fix-admin-routesDmitriy Zaporozhets2016-12-111-7/+16
* | | | | 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
|\ \ \ \ \
View Lorry Controller Status