summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added lock/unlock issue discussion widget into right sidebar.lock-issue-discussionFatih Acet2016-08-104-1/+46
* Added vue.js.Fatih Acet2016-08-101-0/+10073
* Merge branch 'link-to-gdk-howtos' into 'master' Achilleas Pipinellis2016-08-101-1/+1
|\
| * Link to doc root, not readme of GDKJacob Vosmaer2016-08-081-1/+1
* | Merge branch 'api-examples-curl-long-options' into 'master' Achilleas Pipinellis2016-08-1046-673/+696
|\ \
| * | use Unix line endings for API documentationwinniehell2016-08-091-514/+514
| * | use long options for curl examples in API documentation (!5703)winniehell2016-08-0944-161/+162
| * | add linting script for documentationwinniehell2016-08-092-0/+22
* | | Merge branch 'default-label-documentation' into 'master' Achilleas Pipinellis2016-08-103-10/+31
|\ \ \
| * | | Clarify the features for generating default label setsMark Fletcher2016-08-093-10/+31
* | | | Merge branch 'rs-rename-run-helper' into 'master' Douwe Maan2016-08-104-17/+15
|\ \ \ \
| * | | | Rename `run` task helper method to prevent conflict with StateMachineRobert Speicher2016-08-094-17/+15
* | | | | Merge branch 'add-caching-for-project-count' into 'master' Robert Speicher2016-08-093-0/+27
|\ \ \ \ \
| * | | | | Add a method in Project to return a cached value of total count of projectsStan Hu2016-08-093-0/+27
* | | | | | Merge branch 'adambuckland/gitlab-ce-19727-sort-submodules-with-files'Douwe Maan2016-08-094-15/+39
|\ \ \ \ \ \
| * | | | | | Update tree view to sort folders with submodulesAdam Buckland2016-08-094-15/+39
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-0910-177/+81
|\ \ \ \ \ \
| * | | | | | Prefixes removed branches name with PR number when importing PR from GHgh-pull-requestsDouglas Barbosa Alexandre2016-08-084-14/+51
| * | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-08-081-0/+1
| * | | | | | Remove SHA suffix for removed branches name when importing PR from GHDouglas Barbosa Alexandre2016-08-083-36/+28
| * | | | | | Allow users to import cross-repository pull requests from GitHubDouglas Barbosa Alexandre2016-08-043-12/+5
| * | | | | | Does not need to disable GitHub webhooks since PRs are check out locallyDouglas Barbosa Alexandre2016-08-044-123/+0
| * | | | | | Check out locally PRs where the source/target branch were removedDouglas Barbosa Alexandre2016-08-041-7/+11
* | | | | | | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-0916-121/+604
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Small refactor in Redis class and improved specsGabriel Mazetto2016-08-064-9/+16
| * | | | | | Small refactor and a few documentation fixesGabriel Mazetto2016-08-044-7/+7
| * | | | | | Added Redis sentinel support to the CHANGELOGGabriel Mazetto2016-08-041-0/+1
| * | | | | | Updated documentations for Redis Sentinel experimental supportGabriel Mazetto2016-08-041-23/+28
| * | | | | | Refactor Redis HA docs to also include SentinelAchilleas Pipinellis2016-08-041-102/+245
| * | | | | | Added Redis Sentinel support documentationGabriel Mazetto2016-08-042-1/+108
| * | | | | | Synced mail_room.yml with the one in omnibusGabriel Mazetto2016-08-041-0/+4
| * | | | | | Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-043-23/+23
| * | | | | | Fixed MailRoom specs and make sure it works with new resque.yml formatGabriel Mazetto2016-08-043-25/+28
| * | | | | | Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-044-30/+27
| * | | | | | Reverted resque.yml -> redis.yml renamingGabriel Mazetto2016-08-041-1/+1
| * | | | | | Make sidekiq get config settings from Gitlab::RedisConfigGabriel Mazetto2016-08-041-8/+6
| * | | | | | Specs for RedisConfigGabriel Mazetto2016-08-046-1/+125
| * | | | | | Deduplicated resque.yml loading from several placesGabriel Mazetto2016-08-047-65/+159
* | | | | | | Merge branch 'relative-link-filter-ref' into 'master' Robert Speicher2016-08-092-5/+21
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Do not look up commit again when it is passed to RelativeLinkFilter (!5455)winniehell2016-08-021-3/+3
| * | | | | | Add failing test for #20026winniehell2016-08-021-2/+18
* | | | | | | Merge branch 'group-icon-alignment' into 'master' Jacob Schatz2016-08-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Align visibility icons on group pagegroup-icon-alignmentAnnabel Dunstone2016-07-251-1/+1
* | | | | | | | Merge branch 'coffeescript-coverage' into 'master' Robert Speicher2016-08-093-4/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Add test coverage analysis for CoffeeScript (!5052)winniehell2016-08-073-4/+15
* | | | | | | | | Merge branch 'fix/import-mr-source' into 'master' Robert Speicher2016-08-094-9/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix MR source project assignmentfix/import-mr-sourceJames Lopez2016-08-094-9/+34
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-broadcast-message-factory-date-range' into 'master' Robert Speicher2016-08-091-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | TST: Use more accurate time windows so tests do not failjoshbabier2016-08-041-2/+2
* | | | | | | | | | Merge branch 'avoid-constant-warnings-in-rails' into 'master' Robert Speicher2016-08-092-2/+2
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status