summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Addressed mr observationsjivl-update-katexJose Ivan Vargas2018-02-121-2/+0
* Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-129-4/+19
|\
| * make sure there is a dependency on Gitlab::CurrentSettings isbw-fix-autoload-issueBrett Walker2018-02-091-0/+1
| * Merge branch 'feature/oidc-groups-claim' into 'master'Douwe Maan2018-02-082-1/+2
| |\
| | * Add groups to OpenID Connect claimsHassan Zamani2018-02-082-1/+2
| * | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-072-1/+8
| * | Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'Kamil Trzciński2018-02-072-2/+3
| |\ \
| | * | Use `resource` in Group Variables routing schemeMatija Čupić2018-02-051-3/+1
| | * | Use `resource` in Project Variables routing schemeMatija Čupić2018-02-051-3/+1
| | * | Remove redundant routes in Groups::VariablesControllerMatija Čupić2018-02-051-4/+2
| | * | Port #save_multiple to Groups::VariablesControllerMatija Čupić2018-02-051-1/+5
| | * | Remove redundant routes in VariablesControllerMatija Čupić2018-02-051-4/+2
| | * | Stub multiple variable controller methodMatija Čupić2018-02-051-1/+6
| * | | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-061-0/+1
| * | | Added ldap config setting to lower case usernamesFrancisco Javier López2018-02-052-0/+4
| |/ /
* | | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-0526-85/+384
|\ \ \ | |/ /
| * | Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-0/+82
| |/
| * Merge branch 'persistent-callouts' into 'master'Kamil Trzciński2018-02-051-0/+3
| |\
| | * Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-0212-63/+126
| | |\
| | * | Rename Callout to UserCalloutMatija Čupić2018-02-021-2/+2
| | * | Refactor CalloutsControllerMatija Čupić2018-02-021-3/+1
| | * | Move Callouts route to - pathMatija Čupić2018-01-271-5/+5
| | * | Implement Callouts controllerMatija Čupić2018-01-261-0/+5
| * | | Merge branch 'query-counts' into 'master'Rémy Coutable2018-02-051-0/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-011-0/+9
| * | | Merge branch 'webpack-auto-config' into 'master'Jacob Schatz2018-02-021-0/+23
| |\ \ \
| | * | | prevent dynamic chunks from being duplicated by the dispatcher until it is co...Mike Greiling2018-02-011-2/+13
| | * | | generate webpack entry points for pages directory automaticallyMike Greiling2018-02-011-0/+12
| | |/ /
| * | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-012-2/+19
| |/ /
| * | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-016-17/+17
| * | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-311-0/+2
| |\ \
| | * | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-311-0/+2
| * | | Don't assume postgresql in two initializersNick Thomas2018-01-302-44/+48
| |/ /
| * | Merge branch 'grape-router-helpers-bugfix' into 'master'Rémy Coutable2018-01-301-0/+16
| |\ \
| | * | Fix grape-route-helper route shadowinggrape-router-helpers-bugfixMario de la Ossa2018-01-291-0/+16
| | |/
| * | Eliminate the last warning for redis wrapperLin Jen-Shin2018-01-261-0/+1
| |/
| * Merge branch '42420-follow-up-from-resolve-asset-was-not-declared-to-be-preco...Grzegorz Bizon2018-01-266-13/+29
| |\
| | * Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-icoRémy Coutable2018-01-256-13/+29
| * | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-251-28/+0
| |\ \
| | * | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-251-28/+0
| | |/
| * | Merge branch '40028-special-characters-on-issuable-templates' into 'master'Rémy Coutable2018-01-251-1/+1
| |\ \ | | |/ | |/|
| | * Handle special characters on API request of issuable templatesTakuya Noguchi2018-01-251-1/+1
| * | Merge branch 'default-to-https-for-gravatar-urls' into 'master'Rémy Coutable2018-01-252-4/+6
| |\ \
| | * | Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urlsAchilleas Pipinellis2018-01-252-4/+6
| | |/
| * | Merge branch 'jej/gitattributes-check-at-ref' into 'master'Rémy Coutable2018-01-251-2/+2
| |\ \ | | |/ | |/|
| | * Can parse root .gitattributes file for a refjej/gitattributes-check-at-refJames Edwards-Jones2018-01-241-2/+2
| * | Merge branch 'groups-webpack-bundle' into 'master'Filipa Lacerda2018-01-241-3/+0
| |\ \
| | * | Added dispatcher imports for groups webpack bundlePhil Hughes2018-01-231-5/+2
| * | | correctly imports performance barPhil Hughes2018-01-241-3/+2
| * | | Merge branch '42251-explicit-timezone-for-karma' into 'master'Mike Greiling2018-01-231-0/+2
| |\ \ \
View Lorry Controller Status