Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | makes system notes less intrusive to a conversationless-intrusive-system-note | Nur Rony | 2016-11-17 | 8 | -28/+153 |
* | Merge branch '23034-setup-test-env-in-prepare-stage' into 'master' | Sean McGivern | 2016-11-17 | 1 | -2/+13 |
|\ | |||||
| * | tests: Move rake assets:precompile and cloning gitlab-{shell,test} to the pre... | Nick Thomas | 2016-11-16 | 1 | -2/+13 |
* | | Merge branch 'fix/trace-patch-updated-at' into 'master' | Kamil Trzciński | 2016-11-16 | 3 | -5/+90 |
|\ \ | |||||
| * | | Add CHANGELOG entryfix/trace-patch-updated-at | Tomasz Maczukin | 2016-11-16 | 1 | -0/+4 |
| * | | Update the updated_at of a build while patching the trace | Tomasz Maczukin | 2016-11-15 | 2 | -5/+86 |
* | | | Merge branch 'related-mr-labels' into 'master' | Annabel Dunstone Gray | 2016-11-16 | 3 | -8/+37 |
|\ \ \ | |||||
| * | | | Fix SCSS linter errors. | Didem Acet | 2016-11-16 | 1 | -8/+9 |
| * | | | Added colored labels to related MR list. | Didem Acet | 2016-11-16 | 3 | -8/+36 |
* | | | | Merge branch 'explicitly-disable-eslint-inline' into 'master' | Alfredo Sumaran | 2016-11-16 | 149 | -148/+150 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | explicitly disable eslint inlineexplicitly-disable-eslint-inline | Luke "Jared" Bennett | 2016-11-15 | 149 | -148/+150 |
| | |/ | |/| | |||||
* | | | Merge branch 'fix-failing-user-without-projects-specs' into 'master' | Sean McGivern | 2016-11-16 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix some failing specs due to missing access_requestable trait | Nick Thomas | 2016-11-16 | 1 | -1/+1 |
* | | | | Merge branch '24496-fix-internal-api-project-lookup' into 'master' | Sean McGivern | 2016-11-16 | 7 | -61/+126 |
|\ \ \ \ | |||||
| * | | | | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project paths | Nick Thomas | 2016-11-16 | 7 | -61/+126 |
* | | | | | Merge branch 'fix-shibboleth-auth-with-no-uid' into 'master' | Rémy Coutable | 2016-11-16 | 2 | -0/+8 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | fix shibboleth misconfigurations resulting in authentication bypassfix-shibboleth-auth-with-no-uid | Brian Neel | 2016-11-14 | 2 | -0/+8 |
* | | | | | Merge branch 'patch-5' into 'master' | Rémy Coutable | 2016-11-16 | 3 | -1/+24 |
|\ \ \ \ \ | |||||
| * | | | | | fix "Without projects" filter | Ben Bodenmiller | 2016-11-16 | 3 | -1/+24 |
* | | | | | | Merge branch '23824-activity-page-does-not-show-commits-comments' into 'master' | Robert Speicher | 2016-11-16 | 4 | -5/+36 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow commit note to be visible if repo is visible23824-activity-page-does-not-show-commits-comments | Rémy Coutable | 2016-11-16 | 4 | -5/+36 |
* | | | | | | | Merge branch 'user-dropdown-multiple-requests-fix' into 'master' | Fatih Acet | 2016-11-16 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Stopped multiple requests with dropdownsuser-dropdown-multiple-requests-fix | Phil Hughes | 2016-11-16 | 2 | -1/+5 |
* | | | | | | | | Merge branch 'issue-boards-counter-border-fix' into 'master' | Fatih Acet | 2016-11-16 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed issue boards counter border when unauthorizedissue-boards-counter-border-fix | Phil Hughes | 2016-11-16 | 2 | -1/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' | Douwe Maan | 2016-11-16 | 11 | -54/+49 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessary | Adam Niedzielski | 2016-11-16 | 11 | -54/+49 |
* | | | | | | | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' | Sean McGivern | 2016-11-16 | 11 | -83/+155 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Search for a filename in a project23117-search-for-a-filename-in-a-project | Valery Sizov | 2016-11-16 | 11 | -83/+155 |
* | | | | | | | | | Merge branch '21992-disable-access-requests-by-default' into 'master' | Robert Speicher | 2016-11-16 | 27 | -78/+122 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make access request specs explicitly enable or disable access requests as req... | Nick Thomas | 2016-11-11 | 24 | -76/+96 |
| * | | | | | | | | | Set 'request_access_enabled' false by default | Chris Wilson | 2016-11-11 | 3 | -2/+26 |
* | | | | | | | | | | Merge branch 'ux-guide-link-update-contributing' into 'master' | Achilleas Pipinellis | 2016-11-16 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | [ci skip] Fix UX Guide link on Contributing.mdux-guide-link-update-contributing | awhildy | 2016-11-15 | 1 | -4/+2 |
* | | | | | | | | | | | Merge branch 'move-snippet-discover-spinach-test-to-rspec' into 'master' | Dmitriy Zaporozhets | 2016-11-16 | 3 | -34/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Move 'Explore Snippets' Spinach feature to Rspec | the-undefined | 2016-11-08 | 3 | -34/+16 |
* | | | | | | | | | | | | Merge branch 'fix-merge-request-screen-deleted-source-branch' into 'master' | Sean McGivern | 2016-11-16 | 3 | -9/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Do not create a MergeRequestDiff record when source branch is deletedfix-merge-request-screen-deleted-source-branch | Adam Niedzielski | 2016-11-16 | 3 | -9/+26 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'rs-issue-24527' into 'master' | Sean McGivern | 2016-11-16 | 3 | -25/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Limit labels returned for a specific project as an administrator | Robert Speicher | 2016-11-16 | 3 | -25/+41 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'setter-for-key' into 'master' | Dmitriy Zaporozhets | 2016-11-16 | 3 | -9/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Remove instance vars from key model tests | Semyon Pupkov | 2016-11-16 | 1 | -6/+6 |
| * | | | | | | | | | | | Use setter for key instead AR callback | Semyon Pupkov | 2016-11-16 | 3 | -3/+18 |
* | | | | | | | | | | | | Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' | Sean McGivern | 2016-11-16 | 3 | -9/+51 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | add tests | Francesco Coda Zabetta | 2016-11-15 | 1 | -6/+21 |
| * | | | | | | | | | | | | use Enumerable#find insted of select + first | Francesco Coda Zabetta | 2016-11-15 | 1 | -3/+3 |
| * | | | | | | | | | | | | fix changelog typos | Francesco Coda Zabetta | 2016-11-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | fix style | Francesco Coda Zabetta | 2016-11-14 | 1 | -3/+3 |
| * | | | | | | | | | | | | fix style | Francesco Coda Zabetta | 2016-11-14 | 1 | -3/+3 |
| * | | | | | | | | | | | | fix indentation | Francesco Coda Zabetta | 2016-11-14 | 1 | -7/+7 |