Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-lines | Grzegorz Bizon | 2016-07-01 | 162 | -238/+1 |
* | Merge branch '19388-fix-snippets-notes-not-shown' into 'master' | Rémy Coutable | 2016-07-01 | 1 | -1/+1 |
|\ | |||||
| * | Fix snippets comments not displayed19388-fix-snippets-notes-not-shown | Rémy Coutable | 2016-07-01 | 1 | -1/+1 |
* | | Merge branch 'patch-3' into 'master' | Achilleas Pipinellis | 2016-07-01 | 1 | -0/+1 |
|\ \ | |||||
| * | | adding link to .gitlab-ci.yml templates - closes #18998 | Marcia Ramos | 2016-07-01 | 1 | -0/+1 |
* | | | Merge branch 'fix-relative-root-emoji-support' into 'master' | Stan Hu | 2016-07-01 | 2 | -1/+25 |
|\ \ \ | |||||
| * | | | Fix emoji paths in relative root configurations | Stan Hu | 2016-07-01 | 2 | -1/+25 |
| | |/ | |/| | |||||
* | | | Merge branch 'upgrade-thin' into 'master' | Robert Speicher | 2016-07-01 | 2 | -4/+4 |
|\ \ \ | |||||
| * | | | Upgrade Thin from 1.6.1 to 1.7.0. | Connor Shea | 2016-07-01 | 2 | -4/+4 |
* | | | | Merge branch 'todos-api' into 'master' | Rémy Coutable | 2016-07-01 | 12 | -1/+970 |
|\ \ \ \ | |||||
| * | | | | Support creating a todo on issuables via APItodos-api | Robert Schilling | 2016-07-01 | 4 | -2/+268 |
| * | | | | Expose target, filter by state as string | Robert Schilling | 2016-07-01 | 5 | -120/+377 |
| * | | | | Add todos API documentation and changelog | Robert Schilling | 2016-07-01 | 4 | -3/+220 |
| * | | | | pass paginated array when deleting notes | Robert Schilling | 2016-07-01 | 1 | -1/+1 |
| * | | | | Expose action_name | Robert Schilling | 2016-07-01 | 3 | -1/+13 |
| * | | | | Assert response body | Robert Schilling | 2016-07-01 | 1 | -1/+12 |
| * | | | | Add user to project to see todos | Robert Schilling | 2016-07-01 | 2 | -1/+6 |
| * | | | | Move to helper, no instance variables | Robert Schilling | 2016-07-01 | 3 | -17/+10 |
| * | | | | Make tests follow the guidelines | Robert Schilling | 2016-07-01 | 1 | -10/+20 |
| * | | | | Fix rebase | Robert Schilling | 2016-07-01 | 1 | -4/+0 |
| * | | | | Add Todos API | Douglas Barbosa Alexandre | 2016-07-01 | 7 | -1/+203 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'fix/import-export-events' into 'master' | Rémy Coutable | 2016-07-01 | 12 | -2030/+4070 |
|\ \ \ \ | |||||
| * | | | | Many squashed commits | James Lopez | 2016-07-01 | 1 | -7/+1 |
| * | | | | use has_many relationship with events | James Lopez | 2016-07-01 | 7 | -19/+13 |
| * | | | | 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 |