summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* changelog madnessfix/import-export-eventsJames Lopez2016-07-011-7/+1
* use has_many relationship with eventsJames Lopez2016-07-017-19/+13
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-07-01460-740/+1976
|\
| * 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
| |\ \ \ \ \ \ \
| | * | | | | | | Fix broken spec in git_push_service_spec by stubbing an external issue trackerfix-external-issue-renderingStan Hu2016-06-301-0/+2
| | * | | | | | | Handle external issues in IssueReferenceFilterYorick Peterse2016-06-304-6/+43
| * | | | | | | | Merge branch 'ericidema/gitlab-ce-import-with-github-personal-access-tokens' ...Douwe Maan2016-06-3013-54/+176
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Make GH one-off auth the default again for importing GH projectsRémy Coutable2016-06-306-21/+30
| | * | | | | | | Import from Github using Personal Access Tokens.Eric K Idema2016-06-3012-54/+167
| * | | | | | | | Merge branch 'fix-changelog' into 'master' Rémy Coutable2016-06-301-1/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix wrong line in changelogRobert Schilling2016-06-301-1/+0
| * | | | | | | | | Merge branch 'fix_restore_warning' into 'master' Rémy Coutable2016-06-302-1/+3
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix restore warning messageDrew Blessing2016-06-282-1/+3
| * | | | | | | | | Merge branch 'sidebar-breakpoint' into 'master' Jacob Schatz2016-06-302-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Updated breakpoint for sidebar pinningPhil Hughes2016-06-302-2/+2
| * | | | | | | | | Merge branch '18709-branch-tag-collection-caching' into 'master' Yorick Peterse2016-06-305-14/+78
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status