summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-07-01460-740/+1976
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-06-294-14/+7
| |\ \ \ \ \ \ \
| * | | | | | | | add changelogJames Lopez2016-06-291-1/+1
| * | | | | | | | fix final line missingJames Lopez2016-06-291-1/+1
| * | | | | | | | updated integration test fileJames Lopez2016-06-291-0/+0
| * | | | | | | | fixes and refactored JSON specJames Lopez2016-06-292-2023/+4041
| * | | | | | | | bump version - as old exports wont be compatibleJames Lopez2016-06-291-1/+1
| * | | | | | | | fixing events for import/exportJames Lopez2016-06-297-7/+34
* | | | | | | | | Merge branch 'upgrade-sprockets-rails' into 'master' Robert Speicher2016-07-013-6/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-railsConnor Shea2016-06-303-4/+3
| * | | | | | | | Upgrade Sprockets and Sprockets Rails.Connor Shea2016-06-301-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'refactor-tags-branches-api' into 'master' Rémy Coutable2016-07-012-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Ensure that branch and tag names are given in APIrefactor-tags-branches-apiRobert Schilling2016-06-302-7/+7
* | | | | | | | Merge branch 'cache-autocomplete-results' into 'master' Jacob Schatz2016-07-012-2/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Cache autocomplete resultscache-autocomplete-resultsPhil Hughes2016-07-012-2/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '18310-improve-request-access-button' into 'master' Rémy Coutable2016-07-0112-29/+22
|\ \ \ \ \ \ \
| * | | | | | | Improve the request / withdraw access button18310-improve-request-access-buttonRémy Coutable2016-07-0112-29/+22
* | | | | | | | Merge branch '18592-syntaxhighlighter-slow' into 'master' Yorick Peterse2016-07-013-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab18592-syntaxhighlighter-slowPaco Guzman2016-07-013-2/+11
| |/ / / / / /
* | | | | | | Merge branch 'enable-shared-runners-with-admins' into 'master' Rémy Coutable2016-07-017-12/+58
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOG 8.9.5 for runners related fixesLin Jen-Shin2016-07-011-0/+4
| * | | | | | | Merge remote-tracking branch 'upstream/master' into enable-shared-runners-wit...Lin Jen-Shin2016-07-01491-924/+2470
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Disable Metrics/CyclomaticComplexity for Ability.allowedenable-shared-runners-with-adminsLin Jen-Shin2016-06-301-0/+1
| * | | | | | | Use warning for locked runners:Lin Jen-Shin2016-06-302-2/+2
| * | | | | | | Use Ability to check pre-requisite. Change back to 403 because:Lin Jen-Shin2016-06-292-2/+14
| * | | | | | | Admins should be able to assign locked runners as wellLin Jen-Shin2016-06-281-0/+10
| * | | | | | | They're projects, so we shouldn't show lock iconLin Jen-Shin2016-06-281-3/+0
| * | | | | | | Allow admins to assign locked runners:Lin Jen-Shin2016-06-284-2/+8
| * | | | | | | Use 409 to indicate that interface might be outdatedLin Jen-Shin2016-06-281-2/+2
| * | | | | | | Rename to assignable runner for shared examples:Lin Jen-Shin2016-06-281-3/+3
| * | | | | | | Admin should be able to turn shared runners into specific ones:Lin Jen-Shin2016-06-282-9/+25
* | | | | | | | Merge branch 'avoid-instantiate-tree-for-projects-show-readme-view' into 'mas...Yorick Peterse2016-07-012-1/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Avoid instantiation of a Git::Treeavoid-instantiate-tree-for-projects-show-readme-viewPaco Guzman2016-06-292-1/+7
* | | | | | | | Merge branch 'improve-system-info' into 'master' Stan Hu2016-07-011-11/+38
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Catch permission denied errors and ignore the diskimprove-system-infoJosh Frye2016-06-301-11/+38
* | | | | | | | Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.Robert Speicher2016-06-301-4/+21
* | | | | | | | Merge branch 'as-fix-changelog-entries' into 'master' Robert Speicher2016-06-301-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove additional entries from CHANGELOGAlfredo Sumaran2016-06-301-3/+0
* | | | | | | | | Merge branch 'build-reopen-json' into 'master' Gabriel Mazetto2016-06-301-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Build path sends JSON file pathbuild-reopen-jsonPhil Hughes2016-06-281-1/+1
* | | | | | | | | Merge branch 'cleanup-forgotten-lines' into 'master' Robert Speicher2016-06-302-10/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove coveralls linescleanup-forgotten-linesZ.J. van de Weg2016-06-302-10/+0
* | | | | | | | | | Merge branch 'fix/build-retry-button-in-view' into 'master' Robert Speicher2016-06-304-1/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move Changelog entry for build retry fix to 8.9.4fix/build-retry-button-in-viewGrzegorz Bizon2016-06-301-1/+1
| * | | | | | | | | | Add Changelog entry for build sidebar retry link fixGrzegorz Bizon2016-06-301-0/+1
| * | | | | | | | | | Improve method that tells if build is retryableGrzegorz Bizon2016-06-303-2/+20
| * | | | | | | | | | Do not show build retry link when build is activeGrzegorz Bizon2016-06-302-1/+38
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch '18991-update-test-env-gitlab-shell-version-when-v3-1-0-is-publi...Yorick Peterse2016-06-301-2/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove hardcoded gitlab-shell version in test env now that the required tag i...Alejandro Rodríguez2016-06-301-2/+1
* | | | | | | | | | Merge branch 'fix-external-issue-rendering' into 'master' Robert Speicher2016-06-305-6/+45
|\ \ \ \ \ \ \ \ \ \