summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update spring to 1.7.2 to fix hanging rails consoleupdate-spring-to-1.7.2Kamil Trzcinski2016-07-041-1/+1
* Merge branch '13524-keep-around-commits' into 'master' Douwe Maan2016-07-0412-7/+88
|\
| * Document Repository#keep_aroundDouwe Maan2016-07-041-4/+8
| * Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-0412-7/+84
* | Merge branch 'downgrade-redis-3-2-2' into 'master' Robert Speicher2016-07-032-1/+2
|\ \
| * | Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiqdowngrade-redis-3-2-2Stan Hu2016-07-012-1/+2
| |/
* | Merge branch 'redcloth-4-3-2-cve-2012-6684' into 'master' Stan Hu2016-07-033-3/+4
|\ \
| * | Update CHANGELOGTakuya Noguchi2016-07-031-0/+1
| * | Update RedCloth to 4.3.2 for CVE-2012-6684Takuya Noguchi2016-07-032-3/+3
* | | Merge branch '19448-merge-requests-api-has-incorrect-documentation-regarding-...Robert Schilling2016-07-031-1/+1
|\ \ \ | |/ / |/| |
| * | Fix typo in Merge Requests API documentation19448-merge-requests-api-has-incorrect-documentation-regarding-merge_when_build_succeedsAlejandro Rodríguez2016-07-021-1/+1
|/ /
* | Merge branch 'git-http-kerberos-ce' into 'master' Douwe Maan2016-07-013-16/+59
|\ \
| * | Groundwork for Kerberos SPNEGO (EE feature)Jacob Vosmaer2016-07-013-16/+59
* | | Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-0131-98/+225
|\ \ \ | |_|/ |/| |
| * | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-0131-98/+225
* | | Merge branch 'upgrade-sidekiq' into 'master' Robert Speicher2016-07-011-3/+4
|\ \ \
| * | | Upgrade Sidekiq from 4.1.2 to 4.1.4.upgrade-sidekiqConnor Shea2016-07-011-3/+4
* | | | Merge branch 'upgrade-seedfu' into 'master' Robert Speicher2016-07-011-3/+3
|\ \ \ \
| * | | | Upgrade seed-fu from 2.3.5 to 2.3.6upgrade-seedfuConnor Shea2016-07-011-3/+3
| |/ / /
* | | | Merge branch 'upgrade-sass-rails' into 'master' Robert Speicher2016-07-011-2/+2
|\ \ \ \
| * | | | Upgrade sass-rails.upgrade-sass-railsConnor Shea2016-06-301-2/+2
* | | | | Merge branch 'rubocop/enable-cops-for-empty-lines' into 'master' Robert Speicher2016-07-01162-238/+1
|\ \ \ \ \
| * | | | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-01162-238/+1
* | | | | | Merge branch 'renable-import-button-when-namespace-already-been-taken' into '...Fatih Acet2016-07-013-5/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-011-0/+1
| * | | | | Cache results from jQuery selectors to retrieve namespace nameDouglas Barbosa Alexandre2016-07-011-4/+7
| * | | | | Fix import button when import fail due the namespace already been takenDouglas Barbosa Alexandre2016-07-012-2/+5
|/ / / / /
* | | | | 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