| Commit message (Expand) | Author | Age | Files | Lines |
* | Rename mattermost_command to mattermost_slash_commandszj-slash-commands-mattermost | Kamil Trzcinski | 2016-11-18 | 1 | -1/+1 |
* | Fix typos | Z.J. van de Weg | 2016-11-18 | 1 | -3/+4 |
* | Improve style, add more tests | Z.J. van de Weg | 2016-11-18 | 3 | -3/+9 |
* | More coverage on service level | Z.J. van de Weg | 2016-11-18 | 1 | -1/+1 |
* | Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermost | Z.J. van de Weg | 2016-11-17 | 1 | -3/+1 |
|\ |
|
| * | Merge branch 'chat-name-authorize' into 'master'
| Rémy Coutable | 2016-11-17 | 1 | -0/+37 |
| |\ |
|
| | * | Improve code design after code review | Kamil Trzcinski | 2016-11-16 | 1 | -3/+1 |
| | * | Merge remote-tracking branch 'origin/master' into chat-name-authorize | Kamil Trzcinski | 2016-11-16 | 30 | -116/+270 |
| | |\ |
|
| | * | | Add most of specs for chat names | Kamil Trzcinski | 2016-11-16 | 1 | -0/+39 |
* | | | | More refactoring, push present to base command | Z.J. van de Weg | 2016-11-17 | 2 | -2/+11 |
* | | | | Add tests for increased converage | Z.J. van de Weg | 2016-11-17 | 3 | -20/+25 |
* | | | | Remove some commands for now | Z.J. van de Weg | 2016-11-17 | 4 | -121/+15 |
* | | | | Incorporate feedback, improve presenter class | Z.J. van de Weg | 2016-11-17 | 3 | -20/+58 |
* | | | | Rename from service, and move to lib/gitlab | Z.J. van de Weg | 2016-11-17 | 6 | -0/+196 |
* | | | | Add most of specs for chat names | Kamil Trzcinski | 2016-11-17 | 1 | -0/+39 |
|/ / / |
|
* | | | Search for a filename in a project23117-search-for-a-filename-in-a-project | Valery Sizov | 2016-11-16 | 1 | -4/+47 |
| |/
|/| |
|
* | | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master'
| Douwe Maan | 2016-11-15 | 1 | -0/+24 |
|\ \ |
|
| * | | Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-images | Stan Hu | 2016-11-14 | 1 | -0/+24 |
* | | | Merge branch 'fix_saml_ldap_link' into 'master'
| Douwe Maan | 2016-11-15 | 1 | -1/+22 |
|\ \ \
| |/ /
|/| | |
|
| * | | Omniauth auto link LDAP user falls back to find by DN when user cannot be fou... | Drew Blessing | 2016-11-10 | 1 | -1/+22 |
| |/ |
|
* | | Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master'
| Kamil Trzciński | 2016-11-14 | 26 | -115/+115 |
|\ \ |
|
| * | | Change name of method for setting CI config entries | Grzegorz Bizon | 2016-11-14 | 1 | -2/+2 |
| * | | Improve naming convention in ci configuration modulefix/improve-naming-convention-in-ci-config | Grzegorz Bizon | 2016-11-14 | 25 | -63/+63 |
* | | | Centralize LDAP config/filter logic | Drew Blessing | 2016-11-11 | 1 | -0/+81 |
|/ / |
|
* | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttling | Patricio Cano | 2016-11-11 | 1 | -6/+0 |
* | | Refactored initializer code to its own class and added tests | Patricio Cano | 2016-11-10 | 1 | -0/+34 |
|/ |
|
* | Merge branch 'ldap_check_bind' into 'master'
| Sean McGivern | 2016-11-09 | 1 | -4/+35 |
|\ |
|
| * | Introduce better credential and error checking to `rake gitlab:ldap:check` | Drew Blessing | 2016-11-08 | 1 | -4/+35 |
* | | Merge branch '23403-fix-events-for-private-project-features' into 'security' | Robert Speicher | 2016-11-09 | 1 | -0/+104 |
* | | Merge branch 'fix-unathorized-cloning' into 'security' | Douwe Maan | 2016-11-09 | 2 | -1/+26 |
* | | Merge branch 'markdown-xss-fix-option-2.1' into 'security' | Douwe Maan | 2016-11-09 | 1 | -0/+22 |
* | | Merge branch 'issue_23548_dev' into 'master' | Douwe Maan | 2016-11-09 | 14 | -56/+102 |
* | | Merge branch 'dz-refactor-contraints' into 'master'
| Dmitriy Zaporozhets | 2016-11-08 | 4 | -42/+42 |
|\ \ |
|
| * | | Add small improvements to constrainers and specs | Dmitriy Zaporozhets | 2016-11-08 | 2 | -2/+2 |
| * | | Refactor routing constraints | Dmitriy Zaporozhets | 2016-11-07 | 4 | -42/+42 |
* | | | Merge branch 'use-separate-token-for-incoming-email' into 'master'
| Douwe Maan | 2016-11-08 | 1 | -4/+4 |
|\ \ \
| |/ /
|/| | |
|
| * | | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-email | tiagonbotelho | 2016-11-07 | 1 | -1/+1 |
| * | | Use separate email-friendly token for incoming email and let incoming | Douwe Maan | 2016-11-07 | 1 | -3/+3 |
| |/ |
|
* | | Refine Git garbage collection | Jacob Vosmaer | 2016-11-04 | 2 | -7/+21 |
|/ |
|
* | Merge branch 'fix/import-export-symlink-vulnerability' into 'security' | Douwe Maan | 2016-11-03 | 3 | -1/+71 |
* | Merge branch 'fix/import-projectmember-security' into 'security' | Douwe Maan | 2016-11-03 | 1 | -2/+5 |
* | Merge branch 'allow-owner-to-run-ci-builds' into 'master'
| Rémy Coutable | 2016-11-02 | 1 | -0/+8 |
|\ |
|
| * | Allow owners to fetch source code in CI buildsallow-owner-to-run-ci-builds | Kamil Trzcinski | 2016-11-01 | 1 | -0/+8 |
* | | Fix project features default values | Felipe Artur | 2016-11-01 | 1 | -0/+35 |
* | | Fix Markdown styling inside reference links | panjan | 2016-11-01 | 5 | -33/+116 |
|/ |
|
* | Merge branch 'use-optimistic-locking' into 'master'
| Stan Hu | 2016-10-28 | 2 | -0/+41 |
|\ |
|
| * | Make retry_lock to not be infiniteuse-optimistic-locking | Kamil Trzcinski | 2016-10-27 | 1 | -0/+11 |
| * | Fix optimistic locking | Kamil Trzcinski | 2016-10-26 | 1 | -0/+2 |
| * | Add tests for optimistic locking | Kamil Trzcinski | 2016-10-26 | 1 | -0/+28 |
* | | Modify GitHub importer to be retryable | Ahmad Sherif | 2016-10-28 | 1 | -2/+5 |