Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'winh-templates-10-2' into 'master' | Oswaldo Ferreira | 2017-11-10 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update templates for 10.2winh-templates-10-2 | Winnie Hellmann | 2017-11-10 | 3 | -3/+3 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'issue_39773_be' into 'master' | Sean McGivern | 2017-11-10 | 3 | -11/+43 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Prevent fast forward merge when rebase is requiredissue_39773_be | Felipe Artur | 2017-11-10 | 3 | -11/+43 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'gitlab-git-remote-repository' into 'master' | Sean McGivern | 2017-11-10 | 6 | -56/+243 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Prepare Repository#fetch_source_branch for migration | Jacob Vosmaer (GitLab) | 2017-11-10 | 6 | -56/+243 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'qa/gb/rspec-decouple-test-instance-address' into 'master' | Rémy Coutable | 2017-11-10 | 5 | -45/+36 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix Rubocop offense in QA scenario entrypointqa/gb/rspec-decouple-test-instance-address | Grzegorz Bizon | 2017-11-10 | 1 | -2/+0 | |
| * | | | | | | Refactor QA specs runners and improve specs | Grzegorz Bizon | 2017-11-10 | 3 | -10/+14 | |
| * | | | | | | Improve QA test scenario entrypoint specs | Grzegorz Bizon | 2017-11-10 | 1 | -7/+7 | |
| * | | | | | | Configure RSpec from within RSpec runner class | Grzegorz Bizon | 2017-11-10 | 3 | -13/+7 | |
| * | | | | | | Do not require to set Capybara app_host in RSpec | Grzegorz Bizon | 2017-11-10 | 3 | -19/+14 | |
| * | | | | | | Fix bootable scenario arguments for OptionParser | Grzegorz Bizon | 2017-11-10 | 1 | -5/+3 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge branch 'cleanup-issues-schema' into 'master' | Sean McGivern | 2017-11-10 | 15 | -12/+257 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Clean up schema of the "issues" tablecleanup-issues-schema | Yorick Peterse | 2017-11-09 | 15 | -12/+257 | |
* | | | | | | | Merge branch 'qa/gb/fix-bootable-scenario-arguments' into 'master' | Rémy Coutable | 2017-11-10 | 2 | -6/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix bootable scenario arguments for OptionParser | Grzegorz Bizon | 2017-11-10 | 2 | -6/+4 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch '32059-fix-oauth-phishing' into 'master' | Douwe Maan | 2017-11-10 | 6 | -7/+50 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add changelog entry for !220532059-fix-oauth-phishing | kushalpandya | 2017-11-10 | 1 | -0/+6 | |
| * | | | | | | | Merge branch '32059-fix-oauth-phishing' into 'security-10-1' | Douwe Maan | 2017-11-10 | 5 | -7/+44 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'sh-use-non-superuser-db' into 'master' | Rémy Coutable | 2017-11-10 | 4 | -1/+32 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Use a non-superuser user to access GitLab to ensure permissions are propersh-use-non-superuser-db | Stan Hu | 2017-11-09 | 4 | -1/+32 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'tz-no-cdn-for-svg-sprites' into 'master' | Douwe Maan | 2017-11-10 | 3 | -5/+34 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Removed Bracketstz-no-cdn-for-svg-sprites | Tim Zallmann | 2017-11-09 | 1 | -1/+1 | |
| * | | | | | Fixed Function + Test based on MR | Tim Zallmann | 2017-11-09 | 2 | -12/+9 | |
| * | | | | | Missing the local url | Tim Zallmann | 2017-11-09 | 1 | -2/+2 | |
| * | | | | | Put Icons Path in Helper | Tim Zallmann | 2017-11-09 | 1 | -6/+9 | |
| * | | | | | Fixed URL Matching in Tests | Tim Zallmann | 2017-11-09 | 1 | -6/+6 | |
| * | | | | | Icon Sprite URL is also local even if asset_host is set | Tim Zallmann | 2017-11-09 | 3 | -2/+31 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge remote-tracking branch 'dev.gitlab.org/master' | Winnie Hellmann | 2017-11-10 | 0 | -0/+0 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Update CHANGELOG.md for 9.5.10 | Winnie Hellmann | 2017-11-08 | 1 | -0/+4 | |
| * | | | | Update CHANGELOG.md for 10.0.6 | Lin Jen-Shin | 2017-11-08 | 1 | -0/+4 | |
| * | | | | Update CHANGELOG.md for 10.1.2 | Lin Jen-Shin | 2017-11-08 | 1 | -0/+4 | |
* | | | | | Merge branch 'mk-add-security-fixes-to-changelog-master' into 'master' | Stan Hu | 2017-11-09 | 2 | -5/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Merge branch 'mk-add-security-fixes-to-changelog-10-1-stable' into '10-1-stable' | Stan Hu | 2017-11-09 | 1 | -0/+2 | |
| * | | | | | Update CHANGELOG.md for 10.1.2 | Lin Jen-Shin | 2017-11-09 | 2 | -5/+4 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master' | Fatih Acet | 2017-11-09 | 2 | -1/+21 | |
|\ \ \ \ \ | ||||||
| * | | | | | Disable issue action button whilst submitting and testdisable-issue-action-button-if-isSubmitting | Luke "Jared" Bennett | 2017-11-06 | 2 | -1/+21 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'br-add-glossary' into 'master' | Sid Sijbrandij | 2017-11-09 | 1 | -16/+133 | |
|\ \ \ \ \ | ||||||
| * | | | | | add glossary part 2br-add-glossary | Brittany Rohde | 2017-11-07 | 1 | -3/+3 | |
| * | | | | | add glossary part 1 | Brittany Rohde | 2017-11-07 | 1 | -13/+130 | |
* | | | | | | Merge branch 'move-filter-mr-clear-search-spec-to-js' into 'master' | Tim Zallmann | 2017-11-09 | 2 | -16/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Move clear search test to JS to reduce overkillmove-filter-mr-clear-search-spec-to-js | Eric Eastwood | 2017-11-09 | 2 | -16/+19 | |
* | | | | | | | Merge branch '37920-improve-breadcrumbs-clipping' into 'master' | Tim Zallmann | 2017-11-09 | 1 | -4/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Dynamically truncate breadcrumbs37920-improve-breadcrumbs-clipping | Annabel Dunstone Gray | 2017-11-08 | 1 | -3/+14 | |
| * | | | | | | | Remove max-width on desktop | Annabel Dunstone Gray | 2017-11-08 | 1 | -1/+4 | |
* | | | | | | | | Merge branch 'winh-subgroups-api' into 'master' | Rémy Coutable | 2017-11-09 | 4 | -26/+230 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add /groups/:id/subgroups endpoint to API | Winnie Hellmann | 2017-11-09 | 4 | -26/+230 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'dm-avatarable-with-asset-host' into 'master' | Rémy Coutable | 2017-11-09 | 8 | -131/+82 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Always return full avatar URL for private/internal groups/projects when asset... | Douwe Maan | 2017-11-09 | 8 | -131/+82 | |
|/ / / / / / / / |