summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backstage/gb/migrate-pipeline-stages-index' into 'master'Kamil Trzciński2018-05-022-0/+48
|\
| * Use stages position column to track stage indexGrzegorz Bizon2018-05-012-5/+5
| * Merge branch 'master' into backstage/gb/migrate-pipeline-stages-indexGrzegorz Bizon2018-05-0118-77/+285
| |\
| * \ Merge branch 'master' into 'backstage/gb/migrate-pipeline-stages-index'Grzegorz Bizon2018-04-2515-136/+126
| |\ \
| * | | Rename stage index column name to priority columnGrzegorz Bizon2018-04-242-5/+5
| * | | Improve stages index migration code readabilityGrzegorz Bizon2018-04-241-10/+10
| * | | Improve performance of stages index migration on PostgreSQLGrzegorz Bizon2018-04-241-9/+28
| * | | Make stages index background migration more idempotentGrzegorz Bizon2018-04-241-0/+1
| * | | Add background migration that migrates stages indicesGrzegorz Bizon2018-04-241-0/+27
| * | | Validate presence of a stage index in the modelGrzegorz Bizon2018-04-241-0/+1
* | | | Merge branch 'dm-commit-trailer-without-gravatar' into 'master'Robert Speicher2018-05-011-1/+0
|\ \ \ \
| * | | | Fix commit trailer rendering when Gravatar is disabledDouwe Maan2018-04-251-1/+0
* | | | | Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master'Douwe Maan2018-05-011-0/+2
|\ \ \ \ \
| * | | | | Use persisted diff data instead fetching Git on discussionsOswaldo Ferreira2018-04-301-0/+2
* | | | | | Merge branch 'helm-add-alpine-mirrors' into 'master'Kamil Trzciński2018-05-011-0/+3
|\ \ \ \ \ \
| * | | | | | Add alpine mirrors while operating on k8s clusterAlessio Caiazza2018-04-301-0/+3
* | | | | | | Merge request and commit discussions APIJan Provaznik2018-05-016-49/+152
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'zj-fix-index-rails' into 'master'Douwe Maan2018-05-011-1/+3
|\ \ \ \ \ \
| * | | | | | Use Ruby methods, not Rails' String#firstZeger-Jan van de Weg2018-05-011-1/+3
| |/ / / / /
* | | | | | show only groups an admin is a member of in dashboards/gropsRoger Rüttimann2018-05-012-9/+10
* | | | | | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-301-15/+36
* | | | | | Merge branch 'bvl-fix-openid-redirect' into 'master'Douwe Maan2018-04-301-0/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Define custom base controller for DoorkeeperBob Van Landuyt2018-04-301-0/+8
| |/ / / /
* | | | | Merge branch 'rebase-in-progress-fast-timeout' into 'master'Douwe Maan2018-04-301-2/+2
|\ \ \ \ \
| * | | | | Use fast timeouts for Gitaly FooInProgress RPC'sJacob Vosmaer2018-04-301-2/+2
* | | | | | Merge branch 'zj-remove-repo-path-remote-repository' into 'master'Douwe Maan2018-04-302-2/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove legacy storage path callZeger-Jan van de Weg2018-04-302-2/+7
* | | | | | Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-04-301-0/+62
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suiteTiago Botelho2018-04-261-0/+62
* | | | | | Merge branch 'jramsay-44880-filter-pipelines-by-sha' into 'master'Kamil Trzciński2018-04-291-0/+1
|\ \ \ \ \ \
| * | | | | | Add sha filter to list pipelinesJames Ramsay2018-04-271-0/+1
* | | | | | | Merge branch 'zj-repository-exist-mandatory' into 'master'Nick Thomas2018-04-271-9/+1
|\ \ \ \ \ \ \
| * | | | | | | Repository#exists? can only be queried with GitalyZeger-Jan van de Weg2018-04-251-9/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Add gitlab-pages admin ping rake taskJacob Vosmaer (GitLab)2018-04-272-0/+126
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'performance/gb/improve-pipeline-creation-service' into 'master'Kamil Trzciński2018-04-261-5/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Do not save associated records for pipeline builds twiceGrzegorz Bizon2018-04-251-5/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-256-34/+28
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg2018-04-256-34/+28
| | |_|/ | |/| |
* | | | Cleanup after adding MR diff's commit_count (try 2)Jan Provaznik2018-04-251-1/+1
| |/ / |/| |
* | | Merge branch 'osw-backport-dev-env-check-for-storage-settings-deprecation' in...Rémy Coutable2018-04-251-1/+1
|\ \ \
| * | | Backport dev env check for storage settings deprecationOswaldo Ferreira2018-04-241-1/+1
* | | | Merge branch 'fix-settings-preloading' into 'master'Rémy Coutable2018-04-252-127/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Do not preload settingsKamil Trzciński2018-04-242-127/+0
* | | | Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan2018-04-241-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Allow admins to push to empty reposBob Van Landuyt2018-04-241-2/+6
| |/ /
* | | Merge branch '10244-add-project-ci-cd-settings' into 'master'Kamil Trzciński2018-04-242-1/+5
|\ \ \
| * \ \ Merge branch 'master' into 10244-add-project-ci-cd-settingsDylan Griffith2018-04-2456-123/+478
| |\ \ \ | | |/ /
| * | | Introduce new ProjectCiCdSetting10244-add-project-ci-cd-settingsYorick Peterse2018-04-162-1/+5
* | | | Merge branch 'jej/refactor-omniauth-controller' into 'master'Douwe Maan2018-04-246-4/+95
|\ \ \ \
| * | | | Auth::User classes refactor adds should_save?James Edwards-Jones2018-04-233-14/+6