Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo... | James Lopez | 2016-07-01 | 460 | -740/+1976 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | ||||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo... | James Lopez | 2016-06-29 | 4 | -14/+7 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | add changelog | James Lopez | 2016-06-29 | 1 | -1/+1 | |
| * | | | | | | | | fix final line missing | James Lopez | 2016-06-29 | 1 | -1/+1 | |
| * | | | | | | | | updated integration test file | James Lopez | 2016-06-29 | 1 | -0/+0 | |
| * | | | | | | | | fixes and refactored JSON spec | James Lopez | 2016-06-29 | 2 | -2023/+4041 | |
| * | | | | | | | | bump version - as old exports wont be compatible | James Lopez | 2016-06-29 | 1 | -1/+1 | |
| * | | | | | | | | fixing events for import/export | James Lopez | 2016-06-29 | 7 | -7/+34 | |
* | | | | | | | | | Merge branch 'upgrade-sprockets-rails' into 'master' | Robert Speicher | 2016-07-01 | 3 | -6/+5 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-rails | Connor Shea | 2016-06-30 | 3 | -4/+3 | |
| * | | | | | | | | Upgrade Sprockets and Sprockets Rails. | Connor Shea | 2016-06-30 | 1 | -2/+2 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'refactor-tags-branches-api' into 'master' | Rémy Coutable | 2016-07-01 | 2 | -7/+7 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | Ensure that branch and tag names are given in APIrefactor-tags-branches-api | Robert Schilling | 2016-06-30 | 2 | -7/+7 | |
* | | | | | | | | Merge branch 'cache-autocomplete-results' into 'master' | Jacob Schatz | 2016-07-01 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Cache autocomplete resultscache-autocomplete-results | Phil Hughes | 2016-07-01 | 2 | -2/+6 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge branch '18310-improve-request-access-button' into 'master' | Rémy Coutable | 2016-07-01 | 12 | -29/+22 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Improve the request / withdraw access button18310-improve-request-access-button | Rémy Coutable | 2016-07-01 | 12 | -29/+22 | |
* | | | | | | | | Merge branch '18592-syntaxhighlighter-slow' into 'master' | Yorick Peterse | 2016-07-01 | 3 | -2/+11 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab18592-syntaxhighlighter-slow | Paco Guzman | 2016-07-01 | 3 | -2/+11 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'enable-shared-runners-with-admins' into 'master' | Rémy Coutable | 2016-07-01 | 7 | -12/+58 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update CHANGELOG 8.9.5 for runners related fixes | Lin Jen-Shin | 2016-07-01 | 1 | -0/+4 | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into enable-shared-runners-wit... | Lin Jen-Shin | 2016-07-01 | 491 | -924/+2470 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| * | | | | | | | Disable Metrics/CyclomaticComplexity for Ability.allowedenable-shared-runners-with-admins | Lin Jen-Shin | 2016-06-30 | 1 | -0/+1 | |
| * | | | | | | | Use warning for locked runners: | Lin Jen-Shin | 2016-06-30 | 2 | -2/+2 | |
| * | | | | | | | Use Ability to check pre-requisite. Change back to 403 because: | Lin Jen-Shin | 2016-06-29 | 2 | -2/+14 | |
| * | | | | | | | Admins should be able to assign locked runners as well | Lin Jen-Shin | 2016-06-28 | 1 | -0/+10 | |
| * | | | | | | | They're projects, so we shouldn't show lock icon | Lin Jen-Shin | 2016-06-28 | 1 | -3/+0 | |
| * | | | | | | | Allow admins to assign locked runners: | Lin Jen-Shin | 2016-06-28 | 4 | -2/+8 | |
| * | | | | | | | Use 409 to indicate that interface might be outdated | Lin Jen-Shin | 2016-06-28 | 1 | -2/+2 | |
| * | | | | | | | Rename to assignable runner for shared examples: | Lin Jen-Shin | 2016-06-28 | 1 | -3/+3 | |
| * | | | | | | | Admin should be able to turn shared runners into specific ones: | Lin Jen-Shin | 2016-06-28 | 2 | -9/+25 | |
* | | | | | | | | Merge branch 'avoid-instantiate-tree-for-projects-show-readme-view' into 'mas... | Yorick Peterse | 2016-07-01 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Avoid instantiation of a Git::Treeavoid-instantiate-tree-for-projects-show-readme-view | Paco Guzman | 2016-06-29 | 2 | -1/+7 | |
* | | | | | | | | Merge branch 'improve-system-info' into 'master' | Stan Hu | 2016-07-01 | 1 | -11/+38 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Catch permission denied errors and ignore the diskimprove-system-info | Josh Frye | 2016-06-30 | 1 | -11/+38 | |
* | | | | | | | | Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9. | Robert Speicher | 2016-06-30 | 1 | -4/+21 | |
* | | | | | | | | Merge branch 'as-fix-changelog-entries' into 'master' | Robert Speicher | 2016-06-30 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove additional entries from CHANGELOG | Alfredo Sumaran | 2016-06-30 | 1 | -3/+0 | |
* | | | | | | | | | Merge branch 'build-reopen-json' into 'master' | Gabriel Mazetto | 2016-06-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Build path sends JSON file pathbuild-reopen-json | Phil Hughes | 2016-06-28 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'cleanup-forgotten-lines' into 'master' | Robert Speicher | 2016-06-30 | 2 | -10/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove coveralls linescleanup-forgotten-lines | Z.J. van de Weg | 2016-06-30 | 2 | -10/+0 | |
* | | | | | | | | | | Merge branch 'fix/build-retry-button-in-view' into 'master' | Robert Speicher | 2016-06-30 | 4 | -1/+57 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Move Changelog entry for build retry fix to 8.9.4fix/build-retry-button-in-view | Grzegorz Bizon | 2016-06-30 | 1 | -1/+1 | |
| * | | | | | | | | | | Add Changelog entry for build sidebar retry link fix | Grzegorz Bizon | 2016-06-30 | 1 | -0/+1 | |
| * | | | | | | | | | | Improve method that tells if build is retryable | Grzegorz Bizon | 2016-06-30 | 3 | -2/+20 | |
| * | | | | | | | | | | Do not show build retry link when build is active | Grzegorz Bizon | 2016-06-30 | 2 | -1/+38 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch '18991-update-test-env-gitlab-shell-version-when-v3-1-0-is-publi... | Yorick Peterse | 2016-06-30 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Remove hardcoded gitlab-shell version in test env now that the required tag i... | Alejandro Rodríguez | 2016-06-30 | 1 | -2/+1 | |
* | | | | | | | | | | Merge branch 'fix-external-issue-rendering' into 'master' | Robert Speicher | 2016-06-30 | 5 | -6/+45 | |
|\ \ \ \ \ \ \ \ \ \ |