Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'saml-ldap-link-flow' into 'master' | Douwe Maan | 2016-06-09 | 1 | -0/+18 |
|\ | |||||
| * | Syntax fixes and better logging around the `ldap_person` method.saml-ldap-link-flow | Patricio Cano | 2016-06-08 | 1 | -2/+1 |
| * | Moved `find_or_create_ldap_user` method to parent class and added logging. | Patricio Cano | 2016-06-07 | 1 | -1/+1 |
| * | Adjust the SAML control flow to allow LDAP identities to be added to an exist... | Patricio Cano | 2016-06-06 | 1 | -0/+19 |
* | | Make Omniauth providers specs to not modify global configuration | Kamil Trzcinski | 2016-06-08 | 3 | -3/+9 |
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-06-08 | 8 | -6/+239 |
|\ \ | |||||
| * \ | Merge branch 'refactor/ci-config-add-facade' into 'master' | Rémy Coutable | 2016-06-07 | 2 | -0/+97 |
| |\ \ | |||||
| | * | | Improve Ci config loader by changing method signaturerefactor/ci-config-add-facade | Grzegorz Bizon | 2016-06-07 | 1 | -4/+4 |
| | * | | Remove duplicated exception in Ci config | Grzegorz Bizon | 2016-06-07 | 1 | -1/+2 |
| | * | | Rename class that loads CI configuration to Loader | Grzegorz Bizon | 2016-06-06 | 2 | -15/+11 |
| | * | | Extract CI config YAML parser to a separate class | Grzegorz Bizon | 2016-06-03 | 2 | -1/+67 |
| | * | | Add gitlab ci configuration class that holds hash | Grzegorz Bizon | 2016-06-03 | 1 | -0/+34 |
| * | | | Merge branch 'issue_14189' into 'master' | Jacob Schatz | 2016-06-07 | 1 | -0/+16 |
| |\ \ \ | |||||
| | * | | | Improve Issuable.order_labels_priority | Rémy Coutable | 2016-06-06 | 1 | -0/+16 |
| * | | | | Merge branch 'rename-ci-commit-phase-2' into 'master' | Douwe Maan | 2016-06-07 | 1 | -4/+4 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-07 | 1 | -3/+10 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Fix tests failures | Kamil Trzcinski | 2016-06-07 | 1 | -2/+2 |
| | * | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 1 | -2/+23 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge remote-tracking branch 'origin/master' into rename-ci-commitrename-ci-commit | Kamil Trzcinski | 2016-06-06 | 1 | -3/+23 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | * | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 1 | -0/+26 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-06 | 1 | -0/+26 |
| | | |\ \ \ \ | |||||
| | * | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features | Kamil Trzcinski | 2016-06-03 | 1 | -3/+2 |
| | |/ / / / / | |||||
| | * | | | | | Rename Ci::Build commit to pipeline | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'gh-disable-webhooks' | Douwe Maan | 2016-06-07 | 1 | -0/+65 |
| |\ \ \ \ \ | |||||
| | * | | | | | Disable Webhooks before proceeding with the GitHub import | Douglas Barbosa Alexandre | 2016-06-06 | 1 | -0/+65 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'gh-fix-comments-on-diff' | Douwe Maan | 2016-06-07 | 1 | -0/+2 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Fix importer for GitHub comments on diffgh-fix-comments-on-diff | Douglas Barbosa Alexandre | 2016-06-06 | 1 | -0/+2 |
| | |/ / / | |||||
| * | | | | Merge branch 'issue_3359' into 'master' | Yorick Peterse | 2016-06-06 | 1 | -3/+10 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | change add_concurrent_index function argumentsissue_3359 | Felipe Artur | 2016-06-06 | 1 | -3/+10 |
| | |/ / | |||||
| * | | | Merge branch 'tests/extend-specs-for-build-badge' into 'master' | Rémy Coutable | 2016-06-06 | 1 | -3/+23 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Extend specs for builds badgetests/extend-specs-for-build-badge | Grzegorz Bizon | 2016-06-03 | 1 | -3/+23 |
| | |/ | |||||
| * | | Merge branch 'master' into awardablesawardables | Z.J. van de Weg | 2016-06-03 | 2 | -2/+39 |
| |\ \ | | |/ | |||||
| * | | Merge branch 'master' into awardables | ZJ van de Weg | 2016-05-30 | 14 | -40/+108 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into awardables | ZJ van de Weg | 2016-05-25 | 5 | -22/+237 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-18 | 6 | -45/+102 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into awardables | Zeger-Jan van de Weg | 2016-05-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into awardables | Zeger-Jan van de Weg | 2016-05-11 | 14 | -75/+330 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Create table for award emoji | Zeger-Jan van de Weg | 2016-05-06 | 1 | -0/+26 |
* | | | | | | | | Changes after more review from Rémy | Jacob Vosmaer | 2016-06-03 | 1 | -4/+4 |
* | | | | | | | | Rename finder to find_in_gitlab_or_ldap | Jacob Vosmaer | 2016-06-02 | 1 | -8/+8 |
* | | | | | | | | Merge branch 'master' into git-http-controller | Jacob Vosmaer | 2016-06-02 | 34 | -160/+816 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'separate-banzai-references' into 'master' | Douwe Maan | 2016-06-01 | 1 | -0/+37 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Added Gitlab::Lazy | Yorick Peterse | 2016-05-26 | 1 | -0/+37 |
| * | | | | | | | | Merge branch 'current-settings-use-request-store-during-request' | Douwe Maan | 2016-06-01 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Update tests for the current_application_settings request store changes | DJ Mountney | 2016-05-27 | 1 | -2/+2 |
| * | | | | | | | | Improve note factory | Grzegorz Bizon | 2016-05-29 | 1 | -8/+8 |
| * | | | | | | | | Update specs to carry out changes in note factory | Grzegorz Bizon | 2016-05-29 | 1 | -17/+54 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'measure-proxy-timing' into 'master' | Yorick Peterse | 2016-05-26 | 1 | -0/+31 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Rename metric to 'rails queue duration' | Jacob Vosmaer | 2016-05-26 | 1 | -2/+2 |
| | * | | | | | | Test ProxyFlightTime middleware | Jacob Vosmaer | 2016-05-25 | 1 | -0/+31 |
| | | |_|_|_|/ | | |/| | | | |