summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-133-5/+5
|\
| * Improve Gitlab::Auth method namesJacob Vosmaer2016-06-103-5/+5
* | Merge remote-tracking branch 'origin/master' into artifacts-whenKamil Trzcinski2016-06-1320-137/+211
|\ \
| * | Removed old comment from update_column_in_batchesfix-migration-helper-race-conditionsYorick Peterse2016-06-131-2/+0
| * | Update columns in batches until no rows are leftYorick Peterse2016-06-131-2/+5
| * | Handle NULL migration errors in migration helpersYorick Peterse2016-06-131-2/+2
| * | Refactored SVG sanitizerGabriel Mazetto2016-06-121-24/+23
| * | Refactor SVG sanitizer and prevent `xlink:href` to refer to external resourcesGabriel Mazetto2016-06-121-5/+15
| * | Fix SVG whitelisting to allow namespaced attributesGabriel Mazetto2016-06-121-5/+18
| * | Fix Error 500 when using closes_issues API with an external issue trackerStan Hu2016-06-113-1/+14
| * | Only create the backup directory if it is localStan Hu2016-06-101-3/+18
| * | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-103-15/+23
| |\ \
| | * | Satisfy Rubocopworkhorse-helpersDouwe Maan2016-06-101-2/+2
| | * | Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-1017-106/+206
| | |\ \
| | * \ \ Add send_git_diff helperDouwe Maan2016-06-0820-63/+235
| | |\ \ \
| | * | | | Add workhorse controller and API helpersDouwe Maan2016-06-063-11/+17
| * | | | | Merge branch 'rename-ci-commit-phase-4' into 'master' Rémy Coutable2016-06-101-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4Kamil Trzcinski2016-06-104-58/+42
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Fix expose of TriggerRequestKamil Trzcinski2016-06-101-1/+1
| | * | | | | Fix CI TriggerRequest entityrename-ci-commit-phase-4Kamil Trzcinski2016-06-091-1/+1
| * | | | | | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-101-3/+2
| * | | | | | Allow or not merge MR with failed buildRui Anderson2016-06-101-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'gh-rate-limit' into 'master' Douwe Maan2016-06-102-57/+40
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Wrap all rate limiting logic inside GitHub API clientgh-rate-limitDouglas Barbosa Alexandre2016-06-092-57/+40
| | |/ / /
| * | | | Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-091-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-094-33/+60
| | |\ \ \ \ | | | |/ / /
| | * | | | Move award_menu_url variable into gon object.Fatih Acet2016-06-091-0/+1
| * | | | | Properly quote table name in Rake task for MySQL and PostgreSQL compatibilityfix-issue-15259-postgresqlStan Hu2016-06-091-1/+1
| * | | | | Merge branch 'fix_issue_15259' into 'master' Stan Hu2016-06-091-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix bug with SQL syntax error during backup restorationDaniel Beyer2016-05-271-1/+1
| * | | | | Merge branch 'saml-ldap-link-flow' into 'master' Douwe Maan2016-06-092-7/+14
| |\ \ \ \ \
| | * | | | | Syntax fixes and better logging around the `ldap_person` method.saml-ldap-link-flowPatricio Cano2016-06-081-4/+5
| | * | | | | Moved `find_or_create_ldap_user` method to parent class and added logging.Patricio Cano2016-06-072-30/+12
| | * | | | | Adjust the SAML control flow to allow LDAP identities to be added to an exist...Patricio Cano2016-06-062-3/+27
| * | | | | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-092-26/+46
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Implement the correct linking behaviour in `WikiLinkFilter`.Timothy Andrew2016-06-092-26/+46
| * | | | | | Merge branch '14098-customize-after-sign-up-path' into 'master' Robert Speicher2016-06-082-1/+5
| |\ \ \ \ \ \
| | * | | | | | Allow custom text on 'almost there' pageSean McGivern2016-06-082-1/+5
| * | | | | | | Remove obvious comment and extra lineAlfredo Sumaran2016-06-081-2/+0
| * | | | | | | Set target="_blank" for external linksAlfredo Sumaran2016-06-081-0/+3
| |/ / / / / /
| * | | | | | Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-082-3/+3
* | | | | | | Improve after reviewKamil Trzcinski2016-06-101-2/+2
* | | | | | | Added when to artifactsKamil Trzcinski2016-06-081-0/+24
|/ / / / / /
* | | | | | Merge branch 'git-http-controller' into 'master' Rémy Coutable2016-06-085-68/+134
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-0848-382/+596
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fix testsJacob Vosmaer2016-06-062-21/+21
| * | | | | | Use public_sendJacob Vosmaer2016-06-031-2/+1
| * | | | | | Argh mixed up all the negativesJacob Vosmaer2016-06-031-2/+2
| * | | | | | Remove instances of Auth.newJacob Vosmaer2016-06-031-1/+1
| * | | | | | Refactor Gitlab::Auth rate limitingJacob Vosmaer2016-06-032-25/+53