summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'fix-gh-pr-import' into 'master' Douwe Maan2016-03-122-9/+12
|\ \ \ \ \
| * | | | | Fix importing PR's from GitHub when the source repo was removedDouglas Barbosa Alexandre2016-03-102-9/+12
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into redis-c...redis-config-parserJacob Vosmaer2016-03-101-0/+121
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Merge branch 'rs-issue-12944' into 'master' Douwe Maan2016-03-111-0/+23
|\ \ \ \ \ \
| * | | | | | Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944Robert Speicher2016-03-081-0/+23
* | | | | | | Removed order from sub-query projects for searchYorick Peterse2016-03-111-1/+1
* | | | | | | Added ProjectSearchResults#project_ids_relationYorick Peterse2016-03-111-0/+4
* | | | | | | Refactor Gitlab::ProjectSearchResultsYorick Peterse2016-03-111-7/+3
* | | | | | | Refactor Gitlab::SnippetSearchResultsYorick Peterse2016-03-111-5/+5
* | | | | | | Refactor Gitlab::SearchResultsYorick Peterse2016-03-111-9/+16
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'remove-benchmark-suite' into 'master' Douwe Maan2016-03-111-11/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Removed benchmark suite and its documentationremove-benchmark-suiteYorick Peterse2016-03-101-11/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'gitlab-ci-yaml-alias' into 'master' Kamil Trzciński2016-03-111-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Support YAML alias/anchor usage in .gitlab-ci.ymlPascal Bach2016-03-081-1/+1
* | | | | web hooks to webhooksashleys2016-03-102-8/+8
* | | | | Typoexpiring-lockJacob Vosmaer2016-03-101-1/+1
* | | | | Make comment less ambivalentJacob Vosmaer2016-03-101-2/+1
* | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into expirin...Jacob Vosmaer2016-03-101-0/+121
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'rs-sprite-task' into 'master' Dmitriy Zaporozhets2016-03-091-0/+121
| |\ \ \ \
| | * | | | Add a `gemojione:sprite` Rake taskRobert Speicher2016-03-091-0/+121
| | | |/ / | | |/| |
* | | | | Remove unnecessary random keyJacob Vosmaer2016-03-101-7/+1
* | | | | Improve commentJacob Vosmaer2016-03-101-2/+2
* | | | | Move method to UserJacob Vosmaer2016-03-103-14/+14
* | | | | Explain LDAP "lock" behaviorJacob Vosmaer2016-03-101-2/+6
* | | | | Rename ExpiringLock to ExclusiveLeaseJacob Vosmaer2016-03-103-53/+38
* | | | | Acquire lock before LDAP syncJacob Vosmaer2016-03-093-2/+61
| |_|_|/ |/| | |
* | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into redis-c...Jacob Vosmaer2016-03-091-28/+34
|\ \ \ \ | |/ / /
| * | | Retry spinach testsKamil Trzcinski2016-03-091-28/+34
* | | | Always with the newlinesJacob Vosmaer2016-03-091-1/+1
* | | | Parse config/resque.yml in one place onlyJacob Vosmaer2016-03-092-3/+33
|/ / /
* | | Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master' Rémy Coutable2016-03-091-1/+1
|\ \ \
| * | | Fix bug where Bitbucket `closed` issues were imported as `opened`iurisilvio/gitlab-ce-bitbucket_closedIuri de Silvio2016-03-071-1/+1
| | |/ | |/|
* | | Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-091-1/+1
|\ \ \ | |_|/ |/| |
| * | Remove `Snippet#expires_at`rs-snippets-dont-expireRobert Speicher2016-03-051-1/+1
* | | Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master' Robert Speicher2016-03-081-0/+2
|\ \ \ | |_|/ |/| |
| * | Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-apievuez2016-03-041-0/+2
* | | Merge branch 'feature/cross-project-labels' into 'master' Douwe Maan2016-03-072-55/+26
|\ \ \
| * | | Remove redundant code in cross project labels implementationGrzegorz Bizon2016-03-031-4/+0
| * | | Add additional text prefix in cross project labelsGrzegorz Bizon2016-03-031-2/+6
| * | | Add support for cross project references for labelsGrzegorz Bizon2016-03-031-54/+23
| * | | Fix bug with return value in abstract reference filterGrzegorz Bizon2016-03-031-0/+2
* | | | Merge branch 'master' into 'master' Robert Speicher2016-03-051-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Reduce progress bar noise during brakeman runPeter Suschlik2016-03-041-1/+1
* | | | Merge branch 'rs-frontmatter-pre' into 'master' Robert Speicher2016-03-054-0/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Add YamlFrontMatterFilter to the PreProcessPipelineRobert Speicher2016-03-042-1/+30
| * | | Add a PreProcessPipelineRobert Speicher2016-03-023-0/+26
| |/ /
* | | Merge branch 'rs-wiki-pipeline-spec' into 'master' Douwe Maan2016-03-041-3/+5
|\ \ \ | |_|/ |/| |
| * | Replace `[[_TOC_]]` tag even if `toc` result is blankrs-wiki-pipeline-specRobert Speicher2016-03-031-3/+5
* | | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-036-56/+48
| |/ |/|
* | Merge branch 'rs-filter-array' into 'master' Douwe Maan2016-03-0210-13/+37
|\ \