Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'award-emoji-fixes' into 'master' | Jacob Schatz | 2016-06-09 | 1 | -0/+1 |
|\ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes | Fatih Acet | 2016-06-09 | 4 | -33/+60 |
| |\ | |||||
| * | | Move award_menu_url variable into gon object. | Fatih Acet | 2016-06-09 | 1 | -0/+1 |
* | | | Properly quote table name in Rake task for MySQL and PostgreSQL compatibilityfix-issue-15259-postgresql | Stan Hu | 2016-06-09 | 1 | -1/+1 |
* | | | Merge branch 'fix_issue_15259' into 'master' | Stan Hu | 2016-06-09 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix bug with SQL syntax error during backup restoration | Daniel Beyer | 2016-05-27 | 1 | -1/+1 |
* | | | Merge branch 'saml-ldap-link-flow' into 'master' | Douwe Maan | 2016-06-09 | 2 | -7/+14 |
|\ \ \ | |||||
| * | | | Syntax fixes and better logging around the `ldap_person` method.saml-ldap-link-flow | Patricio Cano | 2016-06-08 | 1 | -4/+5 |
| * | | | Moved `find_or_create_ldap_user` method to parent class and added logging. | Patricio Cano | 2016-06-07 | 2 | -30/+12 |
| * | | | Adjust the SAML control flow to allow LDAP identities to be added to an exist... | Patricio Cano | 2016-06-06 | 2 | -3/+27 |
* | | | | Merge branch '18019-fix-wiki-linking' into 'master' | Rémy Coutable | 2016-06-09 | 2 | -26/+46 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Implement the correct linking behaviour in `WikiLinkFilter`. | Timothy Andrew | 2016-06-09 | 2 | -26/+46 |
* | | | | Merge branch '14098-customize-after-sign-up-path' into 'master' | Robert Speicher | 2016-06-08 | 2 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Allow custom text on 'almost there' page | Sean McGivern | 2016-06-08 | 2 | -1/+5 |
* | | | | | Remove obvious comment and extra line | Alfredo Sumaran | 2016-06-08 | 1 | -2/+0 |
* | | | | | Set target="_blank" for external links | Alfredo Sumaran | 2016-06-08 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | Fix pseudo n+1 queries with Note and Note Authors in issuables APIs | Alejandro Rodríguez | 2016-06-08 | 2 | -3/+3 |
* | | | | Merge branch 'git-http-controller' into 'master' | Rémy Coutable | 2016-06-08 | 5 | -68/+134 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-06-08 | 48 | -382/+596 |
| |\ \ \ \ | |||||
| * | | | | | Fix tests | Jacob Vosmaer | 2016-06-06 | 2 | -21/+21 |
| * | | | | | Use public_send | Jacob Vosmaer | 2016-06-03 | 1 | -2/+1 |
| * | | | | | Argh mixed up all the negatives | Jacob Vosmaer | 2016-06-03 | 1 | -2/+2 |
| * | | | | | Remove instances of Auth.new | Jacob Vosmaer | 2016-06-03 | 1 | -1/+1 |
| * | | | | | Refactor Gitlab::Auth rate limiting | Jacob Vosmaer | 2016-06-03 | 2 | -25/+53 |
| * | | | | | Changes after more review from Rémy | Jacob Vosmaer | 2016-06-03 | 1 | -13/+13 |
| * | | | | | Rename finder to find_in_gitlab_or_ldap | Jacob Vosmaer | 2016-06-02 | 3 | -4/+4 |
| * | | | | | Merge branch 'master' into git-http-controller | Jacob Vosmaer | 2016-06-02 | 137 | -982/+2817 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Remove parallel assignment | Jacob Vosmaer | 2016-05-03 | 1 | -1/+2 |
| * | | | | | Rubocop and whitespace | Jacob Vosmaer | 2016-05-02 | 1 | -2/+2 |
| * | | | | | Use correct auth finder | Jacob Vosmaer | 2016-05-02 | 2 | -7/+2 |
| * | | | | | Make CI/Oauth/rate limiting reusable | Jacob Vosmaer | 2016-04-29 | 3 | -15/+102 |
| * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-04-15 | 22 | -88/+300 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-04-12 | 67 | -349/+946 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Move workhorse protocol code into lib | Jacob Vosmaer | 2016-04-06 | 1 | -0/+7 |
| * | | | | | | | Delete dead code | Jacob Vosmaer | 2016-04-06 | 1 | -52/+1 |
* | | | | | | | | Merge branch 'gh-disable-webhooks' into 'master' | Douwe Maan | 2016-06-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Check if GitHub rate limite API was reached before update Webhooksgh-disable-webhooks | Douglas Barbosa Alexandre | 2016-06-07 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'refactor/ci-config-add-facade' into 'master' | Rémy Coutable | 2016-06-07 | 3 | -7/+44 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improve Ci config loader by changing method signaturerefactor/ci-config-add-facade | Grzegorz Bizon | 2016-06-07 | 2 | -2/+2 |
| * | | | | | | | | Remove duplicated exception in Ci config | Grzegorz Bizon | 2016-06-07 | 2 | -6/+1 |
| * | | | | | | | | Rename class that loads CI configuration to Loader | Grzegorz Bizon | 2016-06-06 | 3 | -8/+8 |
| * | | | | | | | | Extract CI config YAML parser to a separate class | Grzegorz Bizon | 2016-06-03 | 2 | -4/+29 |
| * | | | | | | | | Add gitlab ci configuration class that holds hash | Grzegorz Bizon | 2016-06-03 | 2 | -7/+24 |
* | | | | | | | | | Merge branch 'issue_14189' into 'master' | Jacob Schatz | 2016-06-07 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Improve Issuable.order_labels_priority | Rémy Coutable | 2016-06-06 | 1 | -0/+14 |
* | | | | | | | | | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-format | Jacob Vosmaer (GitLab) | 2016-06-07 | 1 | -2/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Workhorse to serve raw diffs | Zeger-Jan van de Weg | 2016-06-03 | 1 | -2/+15 |
* | | | | | | | | | | Merge branch 'rename-ci-commit-phase-3' into 'master' | Douwe Maan | 2016-06-07 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-07 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ |