Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update spring to 1.7.2 to fix hanging rails consoleupdate-spring-to-1.7.2 | Kamil Trzcinski | 2016-07-04 | 1 | -1/+1 |
* | Merge branch '13524-keep-around-commits' into 'master' | Douwe Maan | 2016-07-04 | 12 | -7/+88 |
|\ | |||||
| * | Document Repository#keep_around | Douwe Maan | 2016-07-04 | 1 | -4/+8 |
| * | Don't garbage collect commits that have related DB records like comments | Douwe Maan | 2016-07-04 | 12 | -7/+84 |
* | | Merge branch 'downgrade-redis-3-2-2' into 'master' | Robert Speicher | 2016-07-03 | 2 | -1/+2 |
|\ \ | |||||
| * | | Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiqdowngrade-redis-3-2-2 | Stan Hu | 2016-07-01 | 2 | -1/+2 |
| |/ | |||||
* | | Merge branch 'redcloth-4-3-2-cve-2012-6684' into 'master' | Stan Hu | 2016-07-03 | 3 | -3/+4 |
|\ \ | |||||
| * | | Update CHANGELOG | Takuya Noguchi | 2016-07-03 | 1 | -0/+1 |
| * | | Update RedCloth to 4.3.2 for CVE-2012-6684 | Takuya Noguchi | 2016-07-03 | 2 | -3/+3 |
* | | | Merge branch '19448-merge-requests-api-has-incorrect-documentation-regarding-... | Robert Schilling | 2016-07-03 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix typo in Merge Requests API documentation19448-merge-requests-api-has-incorrect-documentation-regarding-merge_when_build_succeeds | Alejandro Rodríguez | 2016-07-02 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'git-http-kerberos-ce' into 'master' | Douwe Maan | 2016-07-01 | 3 | -16/+59 |
|\ \ | |||||
| * | | Groundwork for Kerberos SPNEGO (EE feature) | Jacob Vosmaer | 2016-07-01 | 3 | -16/+59 |
* | | | Merge branch 'explicit-requesters-scope' into 'master' | Douwe Maan | 2016-07-01 | 31 | -98/+225 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scope | Rémy Coutable | 2016-07-01 | 31 | -98/+225 |
* | | | Merge branch 'upgrade-sidekiq' into 'master' | Robert Speicher | 2016-07-01 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | Upgrade Sidekiq from 4.1.2 to 4.1.4.upgrade-sidekiq | Connor Shea | 2016-07-01 | 1 | -3/+4 |
* | | | | Merge branch 'upgrade-seedfu' into 'master' | Robert Speicher | 2016-07-01 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Upgrade seed-fu from 2.3.5 to 2.3.6upgrade-seedfu | Connor Shea | 2016-07-01 | 1 | -3/+3 |
| |/ / / | |||||
* | | | | Merge branch 'upgrade-sass-rails' into 'master' | Robert Speicher | 2016-07-01 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Upgrade sass-rails.upgrade-sass-rails | Connor Shea | 2016-06-30 | 1 | -2/+2 |
* | | | | | Merge branch 'rubocop/enable-cops-for-empty-lines' into 'master' | Robert Speicher | 2016-07-01 | 162 | -238/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-lines | Grzegorz Bizon | 2016-07-01 | 162 | -238/+1 |
* | | | | | | Merge branch 'renable-import-button-when-namespace-already-been-taken' into '... | Fatih Acet | 2016-07-01 | 3 | -5/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-07-01 | 1 | -0/+1 |
| * | | | | | Cache results from jQuery selectors to retrieve namespace name | Douglas Barbosa Alexandre | 2016-07-01 | 1 | -4/+7 |
| * | | | | | Fix import button when import fail due the namespace already been taken | Douglas Barbosa Alexandre | 2016-07-01 | 2 | -2/+5 |
|/ / / / / | |||||
* | | | | | 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 |