Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove trigram indexes for "ci_runners"remove-ci-runner-trigram-indexes | Yorick Peterse | 2016-08-10 | 3 | -3/+29 |
* | Removed extra newline from redis_spec.rb | Yorick Peterse | 2016-08-10 | 1 | -1/+0 |
* | Merge branch 'zj-import-gitlab-fa-icon' into 'master' | Rémy Coutable | 2016-08-10 | 1 | -26/+12 |
|\ | |||||
| * | Remove duplicate link_to statementszj-import-gitlab-fa-icon | Z.J. van de Weg | 2016-08-10 | 1 | -12/+6 |
| * | Use FA GitLab Icon for import project button | Z.J. van de Weg | 2016-08-08 | 1 | -18/+10 |
* | | Merge branch 'link-to-gdk-howtos' into 'master' | Achilleas Pipinellis | 2016-08-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | Link to doc root, not readme of GDK | Jacob Vosmaer | 2016-08-08 | 1 | -1/+1 |
* | | | Merge branch 'api-examples-curl-long-options' into 'master' | Achilleas Pipinellis | 2016-08-10 | 46 | -673/+696 |
|\ \ \ | |||||
| * | | | use Unix line endings for API documentation | winniehell | 2016-08-09 | 1 | -514/+514 |
| * | | | use long options for curl examples in API documentation (!5703) | winniehell | 2016-08-09 | 44 | -161/+162 |
| * | | | add linting script for documentation | winniehell | 2016-08-09 | 2 | -0/+22 |
* | | | | Merge branch 'default-label-documentation' into 'master' | Achilleas Pipinellis | 2016-08-10 | 3 | -10/+31 |
|\ \ \ \ | |||||
| * | | | | Clarify the features for generating default label sets | Mark Fletcher | 2016-08-09 | 3 | -10/+31 |
* | | | | | Merge branch 'rs-rename-run-helper' into 'master' | Douwe Maan | 2016-08-10 | 4 | -17/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Rename `run` task helper method to prevent conflict with StateMachine | Robert Speicher | 2016-08-09 | 4 | -17/+15 |
* | | | | | | Merge branch 'add-caching-for-project-count' into 'master' | Robert Speicher | 2016-08-09 | 3 | -0/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add a method in Project to return a cached value of total count of projects | Stan Hu | 2016-08-09 | 3 | -0/+27 |
* | | | | | | | Merge branch 'adambuckland/gitlab-ce-19727-sort-submodules-with-files' | Douwe Maan | 2016-08-09 | 4 | -15/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update tree view to sort folders with submodules | Adam Buckland | 2016-08-09 | 4 | -15/+39 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'gh-pull-requests' into 'master' | Douwe Maan | 2016-08-09 | 10 | -177/+81 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Prefixes removed branches name with PR number when importing PR from GHgh-pull-requests | Douglas Barbosa Alexandre | 2016-08-08 | 4 | -14/+51 |
| * | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-08-08 | 1 | -0/+1 |
| * | | | | | | | Remove SHA suffix for removed branches name when importing PR from GH | Douglas Barbosa Alexandre | 2016-08-08 | 3 | -36/+28 |
| * | | | | | | | Allow users to import cross-repository pull requests from GitHub | Douglas Barbosa Alexandre | 2016-08-04 | 3 | -12/+5 |
| * | | | | | | | Does not need to disable GitHub webhooks since PRs are check out locally | Douglas Barbosa Alexandre | 2016-08-04 | 4 | -123/+0 |
| * | | | | | | | Check out locally PRs where the source/target branch were removed | Douglas Barbosa Alexandre | 2016-08-04 | 1 | -7/+11 |
* | | | | | | | | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel' | Douwe Maan | 2016-08-09 | 16 | -121/+604 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Small refactor in Redis class and improved specs | Gabriel Mazetto | 2016-08-06 | 4 | -9/+16 |
| * | | | | | | | Small refactor and a few documentation fixes | Gabriel Mazetto | 2016-08-04 | 4 | -7/+7 |
| * | | | | | | | Added Redis sentinel support to the CHANGELOG | Gabriel Mazetto | 2016-08-04 | 1 | -0/+1 |
| * | | | | | | | Updated documentations for Redis Sentinel experimental support | Gabriel Mazetto | 2016-08-04 | 1 | -23/+28 |
| * | | | | | | | Refactor Redis HA docs to also include Sentinel | Achilleas Pipinellis | 2016-08-04 | 1 | -102/+245 |
| * | | | | | | | Added Redis Sentinel support documentation | Gabriel Mazetto | 2016-08-04 | 2 | -1/+108 |
| * | | | | | | | Synced mail_room.yml with the one in omnibus | Gabriel Mazetto | 2016-08-04 | 1 | -0/+4 |
| * | | | | | | | Few minor fixes to Redis params order and commented out sentinel config | Gabriel Mazetto | 2016-08-04 | 3 | -23/+23 |
| * | | | | | | | Fixed MailRoom specs and make sure it works with new resque.yml format | Gabriel Mazetto | 2016-08-04 | 3 | -25/+28 |
| * | | | | | | | Fixed specs for Gitlab::Redis and code for Redis Sentinel support | Gabriel Mazetto | 2016-08-04 | 4 | -30/+27 |
| * | | | | | | | Reverted resque.yml -> redis.yml renaming | Gabriel Mazetto | 2016-08-04 | 1 | -1/+1 |
| * | | | | | | | Make sidekiq get config settings from Gitlab::RedisConfig | Gabriel Mazetto | 2016-08-04 | 1 | -8/+6 |
| * | | | | | | | Specs for RedisConfig | Gabriel Mazetto | 2016-08-04 | 6 | -1/+125 |
| * | | | | | | | Deduplicated resque.yml loading from several places | Gabriel Mazetto | 2016-08-04 | 7 | -65/+159 |
* | | | | | | | | Merge branch 'relative-link-filter-ref' into 'master' | Robert Speicher | 2016-08-09 | 2 | -5/+21 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Do not look up commit again when it is passed to RelativeLinkFilter (!5455) | winniehell | 2016-08-02 | 1 | -3/+3 |
| * | | | | | | | Add failing test for #20026 | winniehell | 2016-08-02 | 1 | -2/+18 |
* | | | | | | | | Merge branch 'group-icon-alignment' into 'master' | Jacob Schatz | 2016-08-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Align visibility icons on group pagegroup-icon-alignment | Annabel Dunstone | 2016-07-25 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'coffeescript-coverage' into 'master' | Robert Speicher | 2016-08-09 | 3 | -4/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add test coverage analysis for CoffeeScript (!5052) | winniehell | 2016-08-07 | 3 | -4/+15 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/import-mr-source' into 'master' | Robert Speicher | 2016-08-09 | 4 | -9/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix MR source project assignmentfix/import-mr-source | James Lopez | 2016-08-09 | 4 | -9/+34 |
| | |_|_|_|_|/ / / | |/| | | | | | | |