summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move a few controller specs to their correct locationsrs-move-controller-specsRobert Speicher2016-02-185-0/+0
* Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-1/+1
|\
| * bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed...Richard Pidgeon2016-02-181-1/+1
* | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-21/+0
|\ \
| * | No changes to nginx config in this update. Removed unnecessary instructions.Brandon Patton2016-02-181-21/+0
* | | Merge branch 'revert-2782' into 'master' Douwe Maan2016-02-188-378/+27
|\ \ \ | |/ / |/| |
| * | Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-188-378/+27
|/ /
* | Merge branch 'rs-sentry-release-tracking' into 'master' Douwe Maan2016-02-182-2/+3
|\ \
| * | Add release tracking for Sentryrs-sentry-release-trackingRobert Speicher2016-02-172-2/+3
* | | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-188-27/+378
|\ \ \
| * | | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-188-27/+378
| | |/ | |/|
* | | Merge branch 'cache-clear' into 'master' Robert Speicher2016-02-182-5/+18
|\ \ \
| * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into cache-c...Jacob Vosmaer2016-02-1864-208/+777
| |\ \ \ | | |/ /
| * | | Use SCAN during 'rake cache:clear'cache-clearJacob Vosmaer2016-02-182-5/+18
* | | | Merge branch 'autocrlf-lazy' into 'master' Robert Speicher2016-02-182-11/+71
|\ \ \ \ | |_|/ / |/| | |
| * | | Handle raw_repository returning nil in exists?autocrlf-lazyYorick Peterse2016-02-182-0/+8
| * | | Use Repository#exists? in Repository#commit?Yorick Peterse2016-02-181-1/+1
| * | | Added specs for Repository#exists?Yorick Peterse2016-02-181-0/+13
| * | | Fixed Repository#exists? to handle errorsYorick Peterse2016-02-181-6/+5
| * | | Only set autocrlf when creating/updating filesYorick Peterse2016-02-182-5/+45
* | | | Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' Dmitriy Zaporozhets2016-02-182-16/+2
|\ \ \ \
| * | | | Uses cross browser niceScroll to do scrolling on sidebar.Jacob Schatz2016-02-182-16/+2
|/ / / /
* | | | Merge branch 'fix/ci-first-job-allow-failure' into 'master' Kamil Trzciński2016-02-187-3/+117
|\ \ \ \
| * | | | Add specs covering bug in build allowed to fail caseGrzegorz Bizon2016-02-181-0/+29
| * | | | Add Changelog entry for builds scheduler fixfix/ci-first-job-allow-failureGrzegorz Bizon2016-02-181-0/+1
| * | | | Fix builds scheduler when first build is allowed to failGrzegorz Bizon2016-02-183-3/+33
| * | | | Add specs for build status helper classGrzegorz Bizon2016-02-183-3/+36
| * | | | Return a builds array in builds create serviceGrzegorz Bizon2016-02-182-0/+21
* | | | | Merge branch 'rs-git-fetch-labels' into 'master' Kamil Trzciński2016-02-181-2/+2
|\ \ \ \ \
| * | | | | Fix labels for git clone/git fetch Project CI settingrs-git-fetch-labelsRobert Speicher2016-02-161-2/+2
* | | | | | Merge branch 'patch-1' into 'master' Kamil Trzciński2016-02-181-2/+24
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Grammar cleanup in yaml/README.mdMart Somermaa2016-02-031-2/+2
| * | | | | Add example of creating build artifacts only for release tags.Mart Sõmermaa2016-02-031-0/+22
* | | | | | Merge branch 're-add-missing-part-in-update-doc' into 'master' Rémy Coutable2016-02-181-0/+26
|\ \ \ \ \ \
| * | | | | | Re-add section about NGINX config and init script updates in 8.4->8.5 update docre-add-missing-part-in-update-docRémy Coutable2016-02-151-0/+26
* | | | | | | Merge branch 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan2016-02-183-90/+103
|\ \ \ \ \ \ \
| * | | | | | | refactored specJames Lopez2016-02-171-9/+12
| * | | | | | | refactored some stuff based on MR feedbackJames Lopez2016-02-173-63/+34
| * | | | | | | refactored GitPushService and updated specJames Lopez2016-02-153-53/+49
| * | | | | | | typoJames Lopez2016-02-121-1/+1
| * | | | | | | attempt to reduce code complexity on GitPushService#executeJames Lopez2016-02-113-80/+123
* | | | | | | | Merge branch 'rs-update-unicorn' into 'master' Dmitriy Zaporozhets2016-02-182-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Bump unicorn to `~> 4.9.0`rs-update-unicornRobert Speicher2016-02-162-3/+3
* | | | | | | | Merge branch 'issue_13539' into 'master' Robert Speicher2016-02-182-1/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-172-1/+35
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'sqlite_rm_rf' into 'master' Achilleas Pipinellis2016-02-171-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove remaining sqlite method callAchilleas Pipinellis2016-02-171-1/+0
* | | | | | | | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-1714-3/+247
|\ \ \ \ \ \ \ \
| * | | | | | | | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-1714-3/+247
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-1711-71/+77
|\ \ \ \ \ \ \ \
View Lorry Controller Status