Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reduce CE/EE diff in app/views/admin/groups/show.html.haml6216-extract-ee-specific-files-lines-for-app-views-admin-groups | Rémy Coutable | 2018-05-31 | 2 | -1/+11 |
* | Reduce CE/EE diff in app/views/admin/groups/_group.html.haml | Rémy Coutable | 2018-05-31 | 1 | -0/+3 |
* | Reduce CE/EE diff in app/views/admin/groups/_form.html.haml | Rémy Coutable | 2018-05-31 | 2 | -0/+14 |
* | Merge branch 'sh-fix-issue-api-perf-n-plus-one' into 'master' | Nick Thomas | 2018-05-31 | 2 | -1/+6 |
|\ | |||||
| * | Eliminate cached N+1 queries for projects in Issue API | Stan Hu | 2018-05-31 | 2 | -1/+6 |
* | | Merge branch 'rails5-fix-46230' into 'master' | Rémy Coutable | 2018-05-31 | 2 | -6/+11 |
|\ \ | |||||
| * | | Use strings as properties key in kubernetes service spec. | Jasper Maes | 2018-05-30 | 2 | -6/+11 |
* | | | Merge branch 'gitignore-vendor-gitaly-ruby' into 'master' | Rémy Coutable | 2018-05-31 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Add /vendor/gitaly-ruby to gitignore | Jacob Vosmaer | 2018-05-30 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge branch 'rails5-calendar' into 'master' | Yorick Peterse | 2018-05-31 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Replace .having with .where in calendar query | Jan Provaznik | 2018-05-30 | 1 | -1/+1 |
* | | | | Merge branch 'rails5-exists-query' into 'master' | Yorick Peterse | 2018-05-31 | 1 | -5/+3 |
|\ \ \ \ | |||||
| * | | | | Replace `.exists` with `EXISTS ()` | Jan Provaznik | 2018-05-28 | 1 | -5/+3 |
* | | | | | Merge branch 'gitaly-0.104.0' into 'master' | Douwe Maan | 2018-05-31 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Use Gitaly 0.104.0 | Jacob Vosmaer | 2018-05-30 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch '46445-fix-gitaly-tree-entry-encoding' into 'master' | Douwe Maan | 2018-05-31 | 6 | -5/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Fix encoding error in Gitaly::Commit::TreeEntry | Kim "BKC" Carlbäcker | 2018-05-30 | 6 | -5/+13 |
| |/ / / / | |||||
* | | | | | Merge branch '45520-remove-links-from-web-ide-unexpectedly-navigate-you-to-a-... | Phil Hughes | 2018-05-31 | 6 | -148/+84 |
|\ \ \ \ \ | |||||
| * | | | | | Resolve "Remove links from Web IDE unexpectedly navigate you to a different p... | Sam Beckham | 2018-05-31 | 6 | -148/+84 |
|/ / / / / | |||||
* | | | | | Merge branch 'leipert-port-project-settings' into 'master' | Rémy Coutable | 2018-05-31 | 6 | -42/+50 |
|\ \ \ \ \ | |||||
| * | | | | | Cleanup code for General Project Settings | Lukas Eipert | 2018-05-31 | 6 | -42/+50 |
|/ / / / / | |||||
* | | | | | Merge branch '46903-osw-fix-permitted-params-filtering-on-merge-scheduling' i... | Sean McGivern | 2018-05-31 | 3 | -4/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-scheduling | Oswaldo Ferreira | 2018-05-30 | 3 | -4/+9 |
| |/ / / / | |||||
* | | | | | Merge branch '46991-unable-to-start-rails-console-if-using-master-from-gitlab... | Sean McGivern | 2018-05-31 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | better handle a missing gitlab-shell version | Brett Walker | 2018-05-30 | 1 | -2/+2 |
* | | | | | | Merge branch 'rails5-cattr' into 'master' | Douwe Maan | 2018-05-31 | 1 | -3/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix cattr_accessor definition | Jan Provaznik | 2018-05-28 | 1 | -3/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'fj-36819-remove-v3-api' into 'master' | Douwe Maan | 2018-05-31 | 97 | -16029/+356 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Removed API endpoint and specsfj-36819-remove-v3-api | Francisco Javier López | 2018-05-30 | 97 | -16029/+356 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch '46971-extra-whitespace' into 'master' | Phil Hughes | 2018-05-31 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into 46971-extra-whitespace | Filipa Lacerda | 2018-05-31 | 78 | -993/+892 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Remove whitespace | Filipa Lacerda | 2018-05-30 | 1 | -1/+1 |
* | | | | | | | Merge branch 'dm-relative-url-root-in-development' into 'master' | Rémy Coutable | 2018-05-31 | 3 | -2/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix various bugs related to relative_url_root in development | Douwe Maan | 2018-05-29 | 3 | -2/+7 |
* | | | | | | | | Merge branch 'improve-snippets-docs' into 'master' | Achilleas Pipinellis | 2018-05-31 | 1 | -13/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improve structure of snippets documentation | Andreas Kämmerle | 2018-05-31 | 1 | -13/+30 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'add-project-features-docs' into 'master' | Achilleas Pipinellis | 2018-05-31 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Add Wiki and Snippets to project feature overview | Andreas Kämmerle | 2018-05-30 | 1 | -0/+2 |
* | | | | | | | | Update CHANGELOG.md for 10.8.3 | Mayra Cabrera | 2018-05-30 | 6 | -26/+14 |
* | | | | | | | | Merge branch '47002-fix-empty-wiki-illustration' into 'master' | Clement Ho | 2018-05-30 | 3 | -6/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update "col-xs" usage to bootstrap4 | Paul Slaughter | 2018-05-30 | 3 | -6/+6 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'sh-move-blob-data-at-public' into 'master' | Robert Speicher | 2018-05-30 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make Repository#blob_data_at a public method | Stan Hu | 2018-05-30 | 1 | -8/+8 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sh-add-usage-ping-api-settings' into 'master' | Robert Speicher | 2018-05-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add missing usage_ping_enabled to API settings | Stan Hu | 2018-05-30 | 1 | -0/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master' | Filipa Lacerda | 2018-05-30 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix after sign-in with Google buttonfix-nbsp-after-sign-in-with-google | Kamil Trzciński | 2018-05-30 | 2 | -2/+6 |
* | | | | | | | | | Merge branch 'leipert-upgrade-eslint' into 'master' | Mike Greiling | 2018-05-30 | 36 | -774/+615 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Convert spec/javascripts/.eslintrc to yml format as well | Lukas Eipert | 2018-05-30 | 2 | -33/+34 |
| * | | | | | | | | | fix last lints | Lukas Eipert | 2018-05-29 | 3 | -10/+9 |