Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master' | Rémy Coutable | 2017-08-16 | 2 | -11/+53 |
|\ | |||||
| * | Allow a `failure_wait_time` of 0 for storage access | Bob Van Landuyt | 2017-08-16 | 2 | -11/+53 |
* | | Merge branch '36430-edit-milestone-link' into 'master' | Grzegorz Bizon | 2017-08-16 | 1 | -2/+27 |
|\ \ | |||||
| * | | Fix edit milestone path from group milestones list | Jarka Kadlecova | 2017-08-16 | 1 | -2/+27 |
* | | | Merge branch 'dispatcher-race-condition-fix' into 'master' | Tim Zallmann | 2017-08-16 | 2 | -4/+8 |
|\ \ \ | |||||
| * | | | Fix race condition with dispatcher.jsdispatcher-race-condition-fix | Phil Hughes | 2017-08-15 | 2 | -4/+8 |
* | | | | Change find to within for detecting bad search specs | Clement Ho | 2017-08-16 | 11 | -147/+209 |
* | | | | Merge branch 'rs-more-public-send-whitelists' into 'master' | Rémy Coutable | 2017-08-16 | 2 | -2/+9 |
|\ \ \ \ | |||||
| * | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelists | Robert Speicher | 2017-08-14 | 2 | -2/+9 |
* | | | | | Merge branch '34049-public-commits-should-not-require-authentication' into 'm... | Rémy Coutable | 2017-08-16 | 1 | -100/+113 |
|\ \ \ \ \ | |||||
| * | | | | | Added tests for commits API with an unauthenticated user and a public/private... | Jacopo | 2017-08-10 | 1 | -100/+113 |
* | | | | | | Merge branch 'rs-trailingwhitespace-cop' into 'master' | Rémy Coutable | 2017-08-16 | 20 | -35/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix two additional violations caused by previous changesrs-trailingwhitespace-cop | Robert Speicher | 2017-08-15 | 1 | -1/+0 |
| * | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offenses | Robert Speicher | 2017-08-15 | 20 | -35/+35 |
* | | | | | | | Merge branch '34643-fix-project-path-slugify' into 'master' | Rémy Coutable | 2017-08-16 | 2 | -2/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix CI_PROJECT_PATH_SLUG slugify | vanadium23 | 2017-08-15 | 2 | -2/+16 |
* | | | | | | | | Merge branch 'rs-redis-config-paths' into 'master' | Douwe Maan | 2017-08-16 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't depend on `Rails` for Redis configuration file pathsrs-redis-config-paths | Robert Speicher | 2017-08-15 | 1 | -0/+7 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '34533-speed-up-project-creation' into 'master' | Douwe Maan | 2017-08-16 | 1 | -11/+24 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Speed up project creation by inlining repository creation | Nick Thomas | 2017-08-15 | 1 | -11/+24 |
* | | | | | | | | | Don't create event in Merge Request Create Service | Jarka Kadlecova | 2017-08-16 | 2 | -0/+36 |
* | | | | | | | | | Merge branch 'safari-fly-out-fix' into 'master' | Tim Zallmann | 2017-08-16 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Fix the fly-out menu in the sidebar not displaying in Safarisafari-fly-out-fix | Phil Hughes | 2017-08-15 | 1 | -2/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Fix 'Projected tags' typo in protected_tags_spec.rbjej-fix-protected-tags-typo | James Edwards-Jones | 2017-08-15 | 1 | -1/+1 |
* | | | | | | | | Many Repo Fixes | Jacob Schatz | 2017-08-15 | 7 | -62/+47 |
* | | | | | | | | Repo Editor Fixes | Bryce Johnson | 2017-08-15 | 5 | -23/+49 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'issue_31790' into 'master' | Douwe Maan | 2017-08-15 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix API responses when dealing with txt filesissue_31790 | Felipe Artur | 2017-08-15 | 1 | -0/+10 |
* | | | | | | | | Merge branch 'workhorse-deprecate-gitaly-address' into 'master' | Douwe Maan | 2017-08-15 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove deprecated field from workhorse API responsesworkhorse-deprecate-gitaly-address | Jacob Vosmaer | 2017-08-15 | 1 | -1/+0 |
* | | | | | | | | | Merge branch 'fix-any-projects-array' into 'master' | Douwe Maan | 2017-08-15 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Allow usage of any_projects? with an Arrayfix-any-projects-array | Yorick Peterse | 2017-08-15 | 1 | -3/+9 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '36450_confi_polish' into 'master' | Clement Ho | 2017-08-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | change message and change spec36450_confi_polish | Regis | 2017-08-14 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Add two more project templateszj-add-two-more-project-templates | Z.J. van de Weg | 2017-08-15 | 1 | -1/+3 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'malformed-submodule' into 'master' | Douwe Maan | 2017-08-15 | 6 | -4/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Handle missing .gitmodules when getting submodule urlsmalformed-submodule | Jacob Vosmaer | 2017-08-14 | 6 | -4/+14 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Display GPG status loading spinner only when Ajax request is made | Winnie Hellmann | 2017-08-15 | 3 | -0/+72 |
* | | | | | | | Merge branch 'forks-count-cache' into 'master' | Douwe Maan | 2017-08-15 | 6 | -0/+84 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Cache the number of forks of a projectforks-count-cache | Yorick Peterse | 2017-08-14 | 6 | -0/+84 |
* | | | | | | | | Fix edit merge request button inconsistent letter casing | Clement Ho | 2017-08-15 | 3 | -11/+11 |
* | | | | | | | | Merge branch '34533-speed-up-group-project-authorizations' into 'master' | Douwe Maan | 2017-08-15 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Speed up Group#user_ids_for_project_authorizations | Nick Thomas | 2017-08-14 | 1 | -0/+30 |
* | | | | | | | | | Merge branch '34371-pipeline-schedule-vue-files' into 'master' | Phil Hughes | 2017-08-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Move callout to vue file and remove svg from data function to improve perform... | Filipa Lacerda | 2017-08-14 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'repo-fixes-e' into 'master' | Jacob Schatz | 2017-08-14 | 3 | -30/+50 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove overflow tabs logic (no longer used) | Eric Eastwood | 2017-08-14 | 1 | -11/+0 |
| * | | | | | | | | | Remove loading state from repo_tab | Eric Eastwood | 2017-08-14 | 1 | -19/+1 |
| * | | | | | | | | | Use promise syntax with Helper.getContent | Eric Eastwood | 2017-08-14 | 1 | -2/+3 |
| * | | | | | | | | | Split out linkClicked and add tests | Eric Eastwood | 2017-08-14 | 1 | -0/+48 |