summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-01162-238/+1
* Merge branch '19388-fix-snippets-notes-not-shown' into 'master' Rémy Coutable2016-07-011-1/+1
|\
| * Fix snippets comments not displayed19388-fix-snippets-notes-not-shownRémy Coutable2016-07-011-1/+1
* | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-07-011-0/+1
|\ \
| * | adding link to .gitlab-ci.yml templates - closes #18998Marcia Ramos2016-07-011-0/+1
* | | Merge branch 'fix-relative-root-emoji-support' into 'master' Stan Hu2016-07-012-1/+25
|\ \ \
| * | | Fix emoji paths in relative root configurationsStan Hu2016-07-012-1/+25
| | |/ | |/|
* | | Merge branch 'upgrade-thin' into 'master' Robert Speicher2016-07-012-4/+4
|\ \ \
| * | | Upgrade Thin from 1.6.1 to 1.7.0.Connor Shea2016-07-012-4/+4
* | | | Merge branch 'todos-api' into 'master' Rémy Coutable2016-07-0112-1/+970
|\ \ \ \
| * | | | Support creating a todo on issuables via APItodos-apiRobert Schilling2016-07-014-2/+268
| * | | | Expose target, filter by state as stringRobert Schilling2016-07-015-120/+377
| * | | | Add todos API documentation and changelogRobert Schilling2016-07-014-3/+220
| * | | | pass paginated array when deleting notesRobert Schilling2016-07-011-1/+1
| * | | | Expose action_nameRobert Schilling2016-07-013-1/+13
| * | | | Assert response bodyRobert Schilling2016-07-011-1/+12
| * | | | Add user to project to see todosRobert Schilling2016-07-012-1/+6
| * | | | Move to helper, no instance variablesRobert Schilling2016-07-013-17/+10
| * | | | Make tests follow the guidelinesRobert Schilling2016-07-011-10/+20
| * | | | Fix rebaseRobert Schilling2016-07-011-4/+0
| * | | | Add Todos APIDouglas Barbosa Alexandre2016-07-017-1/+203
| | |_|/ | |/| |
* | | | Merge branch 'fix/import-export-events' into 'master' Rémy Coutable2016-07-0112-2030/+4070
|\ \ \ \
| * | | | Many squashed commitsJames 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 '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