summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '21569-dont-add-created-by-for-matched-users' into 'master' Robert Speicher2016-09-123-0/+18
|\
| * Only add the original author if there isn't a linked GitLab accountAndrew Smith2016-09-083-0/+18
* | Merge branch 'restrict_ldap_return_attributes' into 'master' Robert Speicher2016-09-091-3/+68
|\ \
| * | Request only the LDAP attributes we needDrew Blessing2016-09-091-3/+68
* | | Avoid conflict with admin labels when importing GitHub labelsDouglas Barbosa Alexandre2016-09-092-9/+33
* | | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-091-1/+85
|\ \ \ | |/ / |/| |
| * | Constants in specsJacob Vosmaer2016-09-061-1/+1
| * | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-051-1/+85
* | | Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-081-0/+115
|\ \ \
| * | | Sort by database, feedback:Lin Jen-Shin2016-09-061-1/+1
| * | | Just use module because there's nothing to save, feedback:Lin Jen-Shin2016-09-061-4/+4
| * | | Merge remote-tracking branch 'upstream/master' into smart-pipeline-durationLin Jen-Shin2016-09-0223-71/+109
| |\ \ \
| * | | | Calculate real queueing time to exclude gaps from:Lin Jen-Shin2016-09-021-8/+0
| * | | | It's renamed to periodsLin Jen-Shin2016-08-311-2/+2
| * | | | Add test cases from:Lin Jen-Shin2016-08-301-0/+28
| * | | | Rename to periods since it's easier to understandLin Jen-Shin2016-08-301-1/+1
| * | | | Smartly calculate real running time and pending timeLin Jen-Shin2016-08-291-0/+95
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-081-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed gitlab.com importer missing confidential attributeJames Lopez2016-09-051-0/+2
| | |_|/ | |/| |
* | | | Merge branch 'refactor/ci-config-add-logical-validation' into 'master' Rémy Coutable2016-09-079-94/+198
|\ \ \ \
| * \ \ \ Merge branch 'master' into refactor/ci-config-add-logical-validationrefactor/ci-config-add-logical-validationGrzegorz Bizon2016-09-0326-101/+131
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use double instead of spy in job config node specsGrzegorz Bizon2016-09-031-1/+1
| * | | | Add method that returns commands for ci job entryGrzegorz Bizon2016-08-293-24/+43
| * | | | Make it possible to inherit global ci config nodesGrzegorz Bizon2016-08-292-8/+65
| * | | | Add [] method for accessing ci entry dependenciesGrzegorz Bizon2016-08-251-0/+23
| * | | | Remove temporary stub method from ci config nodesGrzegorz Bizon2016-08-255-18/+22
| * | | | Rename unspecified and undefined CI config nodesGrzegorz Bizon2016-08-255-56/+57
* | | | | Fix merge conflict size limitfix-allowed-conflict-sizeSean McGivern2016-09-071-2/+2
* | | | | Fix invalid curl commandKatarzyna Kobierska2016-09-071-1/+1
* | | | | Code refactorKatarzyna Kobierska2016-09-071-1/+1
* | | | | Improve codeKatarzyna Kobierska2016-09-071-3/+6
* | | | | Code refactoringKatarzyna Kobierska2016-09-071-7/+20
* | | | | Fix errors and grammarKatarzyna Kobierska2016-09-071-4/+4
* | | | | Change class method nameKatarzyna Kobierska2016-09-071-8/+8
* | | | | Add class method to encapsulate exceptionKatarzyna Kobierska2016-09-071-0/+19
* | | | | Clean up search result classesclean_up_search_classesValery Sizov2016-09-062-24/+0
| |_|/ / |/| | |
* | | | Use 'git update-ref' for safer web commitsJacob Vosmaer2016-09-021-0/+9
| |/ / |/| |
* | | Merge branch 'issue_19734' into 'master' Douwe Maan2016-09-016-8/+34
|\ \ \
| * | | Project tools visibility levelFelipe Artur2016-09-016-8/+34
* | | | Merge branch 'js-tooltips-for-mentions' into 'master' Robert Speicher2016-09-019-15/+15
|\ \ \ \
| * | | | Use JavaScript tooltips for mentions (!5301)winniehell2016-09-019-15/+15
* | | | | GitHub importer use default project visibility for non-private projectsDouglas Barbosa Alexandre2016-08-311-14/+40
| |/ / / |/| | |
* | | | Merge branch 'refactor/add-policies' into 'master' Robert Speicher2016-08-312-9/+9
|\ \ \ \ | |/ / / |/| | |
| * | | remove Ability.abilitieshttp://jneen.net/2016-08-302-9/+9
* | | | Use updated_at as the last updated date when importing from GitHubDouglas Barbosa Alexandre2016-08-313-10/+7
|/ / /
* | | Rename CI config hidden job entry to hidden entryGrzegorz Bizon2016-08-292-2/+2
* | | Do not enforce using a hash with hidden ci keyGrzegorz Bizon2016-08-291-13/+2
| |/ |/|
* | Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-...Robert Speicher2016-08-251-0/+5
|\ \
| * | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-0/+5
| |/
* | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-251-26/+0
|\ \