| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'pages-multiple-ips-doc' into 'master'
| Kamil Trzciński | 2017-03-16 | 2 | -4/+4 |
|\ |
|
| * | The GitLab Pages external-http and external-https arguments can be specified ... | Nick Thomas | 2017-03-08 | 2 | -4/+4 |
* | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master'
| Filipa Lacerda | 2017-03-16 | 1 | -0/+1 |
|\ \ |
|
| * | | Add 'Undo mark all as done' to Todos | Jacopo | 2017-03-16 | 1 | -0/+1 |
* | | | Merge branch 'fix-legacy-emojis-using-unicode-file-name' into 'master'
| Sean McGivern | 2017-03-16 | 1 | -0/+2 |
|\ \ \ |
|
| * | | | Restore unicode-file-name images for legacy img emojisfix-legacy-emojis-using-unicode-file-name | Eric Eastwood | 2017-03-16 | 1 | -0/+2 |
* | | | | Merge branch 'remove-es6-extension-configuration' into 'master'
| Filipa Lacerda | 2017-03-16 | 2 | -3/+3 |
|\ \ \ \ |
|
| * | | | | remove all references to the .es6 in our config files and documentationremove-es6-extension-configuration | Mike Greiling | 2017-03-15 | 2 | -3/+3 |
| |/ / / |
|
* | | | | Futher rename the CI variableszj-rename-ci-vars | Z.J. van de Weg | 2017-03-16 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge branch 'remove-satellites' into 'master'
| Douwe Maan | 2017-03-14 | 1 | -10/+0 |
|\ \ \ |
|
| * | | | Remove unused satellites config | Stan Hu | 2017-03-13 | 1 | -10/+0 |
| |/ / |
|
* | | | Merge branch '29389-fix-already-initialized-constants' into 'master'
| Robert Speicher | 2017-03-14 | 2 | -9/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constants | Rémy Coutable | 2017-03-13 | 2 | -9/+6 |
* | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master'
| Douwe Maan | 2017-03-13 | 2 | -8/+13 |
|\ \ \
| |/ /
|/| | |
|
| * | | Don't instrument `app/services/concerns` | Bob Van Landuyt | 2017-03-13 | 1 | -7/+11 |
| * | | Move `ResolveDiscussions` into `concerns/issues` folder | Bob Van Landuyt | 2017-03-13 | 1 | -1/+2 |
* | | | Merge branch 'backport-cache-middleware-fix' into 'master'
| Rémy Coutable | 2017-03-13 | 1 | -0/+24 |
|\ \ \
| |/ /
|/| | |
|
| * | | Try out the monkey patch to fix the middlewarebackport-cache-middleware-fix | Lin Jen-Shin | 2017-03-11 | 1 | -0/+24 |
* | | | Execute inflections initializer earlierfix/execute-inflections-initializer-early | Douglas Barbosa Alexandre | 2017-03-10 | 1 | -0/+0 |
|/ / |
|
* | | Merge branch 'enable-snippets-by-default' into 'master'
| Douwe Maan | 2017-03-10 | 2 | -2/+2 |
|\ \ |
|
| * | | Enable snippets for new projects by defaultenable-snippets-by-default | Sean McGivern | 2017-03-10 | 2 | -2/+2 |
* | | | Document gitaly.socket_path setting | Jacob Vosmaer | 2017-03-10 | 1 | -0/+10 |
|/ / |
|
* | | Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master'
| Filipa Lacerda | 2017-03-09 | 1 | -2/+1 |
|\ \ |
|
| * | | Update emojis to use harmony modules (import/export)update-native-unicode-emojis-with-harmony-modules | Eric Eastwood | 2017-03-08 | 1 | -2/+1 |
| |/ |
|
* | | Merge branch 'storage-validation-improvement' into 'master'
| Sean McGivern | 2017-03-09 | 1 | -6/+10 |
|\ \ |
|
| * | | Improve storage validation after configuration structure updatestorage-validation-improvement | Alejandro Rodríguez | 2017-03-08 | 1 | -6/+10 |
| |/ |
|
* | | Merge branch 'move-u2f-bundle' into 'master'
| Alfredo Sumaran | 2017-03-09 | 2 | -1/+1 |
|\ \
| |/
|/| |
|
| * | move u2f library to webpackmove-u2f-bundle | Mike Greiling | 2017-03-07 | 2 | -1/+1 |
* | | Clear AR connections before starting Sidekiq | Yorick Peterse | 2017-03-08 | 1 | -0/+6 |
* | | Merge branch '29005-rspec-profiling-errors-to-warnings' into 'master'
| Robert Speicher | 2017-03-07 | 1 | -9/+28 |
|\ \ |
|
| * | | Swallow collection errors in RspecProfiling | Nick Thomas | 2017-03-07 | 1 | -9/+28 |
* | | | Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-... | Sean McGivern | 2017-03-07 | 1 | -0/+1 |
|\ \ \ |
|
| * \ \ | Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirro...26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages | Phil Hughes | 2017-03-07 | 9 | -13/+22 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Added repository controller and route for the settings namespace | Jose Ivan Vargas | 2017-03-06 | 1 | -0/+1 |
* | | | | Added Prometheus Service and Prometheus graphs | Kamil Trzciński | 2017-03-07 | 1 | -0/+1 |
* | | | | Merge branch '28447-hybrid-repository-storages' into 'master'
| Sean McGivern | 2017-03-07 | 3 | -11/+30 |
|\ \ \ \ |
|
| * | | | | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 3 | -11/+30 |
* | | | | | Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master'
| James Lopez | 2017-03-07 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Change project count limit from 10 to 100000rfr-20170307-change-default-project-number-limit | Regis Freyd | 2017-03-07 | 1 | -1/+1 |
* | | | | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect' | Sean McGivern | 2017-03-07 | 5 | -4/+53 |
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | Add specs for Doorkeeper resource_owner_authenticator | Markus Koller | 2017-03-07 | 1 | -2/+2 |
| * | | | | | Implement OpenID Connect identity provider | Markus Koller | 2017-03-07 | 5 | -2/+51 |
| |/ / / / |
|
* | | | | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat... | Douwe Maan | 2017-03-07 | 1 | -0/+5 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | applies relevant changes to the code and code structure | Tiago Botelho | 2017-02-28 | 1 | -1/+1 |
| * | | | | add admin panel for personal access tokens | Simon Vocella | 2017-02-28 | 1 | -0/+5 |
* | | | | | Improve pipeline triggers UI | Kamil Trzciński | 2017-03-07 | 1 | -1/+5 |
* | | | | | Moved call of SystemHooksService from UpdateMergeRequestsWorker to GitPushSer... | gpongelli | 2017-03-07 | 1 | -0/+1 |
| |_|_|/
|/| | | |
|
* | | | | Merge branch '26371-native-emojis-v3' into 'master'
| Filipa Lacerda | 2017-03-07 | 4 | -5/+1 |
|\ \ \ \ |
|
| * | | | | Use native unicode emojis | Eric Eastwood | 2017-03-06 | 4 | -5/+1 |
* | | | | | Merge branch 'backport-ee-change-webpack-empty-states' into 'master'
| Jacob Schatz | 2017-03-07 | 1 | -0/+1 |
|\ \ \ \ \ |
|