summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add a CHANGELOG entrybugfix/html-only-mailhttp://jneen.net/2016-11-181-0/+4
* fix indentation for rubocophttp://jneen.net/2016-11-171-3/+3
* rename `part` variable and guard against nil content_typehttp://jneen.net/2016-11-171-7/+5
* completely remove blockquote and table tagshttp://jneen.net/2016-11-171-2/+2
* use Nokogiri::HTML.parse instead of capitalized methodhttp://jneen.net/2016-11-171-1/+1
* fix rubocop failureshttp://jneen.net/2016-11-172-2/+4
* add parsing support for incoming html emailhttp://jneen.net/2016-11-176-5/+194
* Merge branch '23034-setup-test-env-in-prepare-stage' into 'master' Sean McGivern2016-11-171-2/+13
|\
| * tests: Move rake assets:precompile and cloning gitlab-{shell,test} to the pre...Nick Thomas2016-11-161-2/+13
* | Merge branch 'fix/trace-patch-updated-at' into 'master' Kamil Trzciński2016-11-163-5/+90
|\ \
| * | Add CHANGELOG entryfix/trace-patch-updated-atTomasz Maczukin2016-11-161-0/+4
| * | Update the updated_at of a build while patching the traceTomasz Maczukin2016-11-152-5/+86
* | | Merge branch 'related-mr-labels' into 'master' Annabel Dunstone Gray2016-11-163-8/+37
|\ \ \
| * | | Fix SCSS linter errors.Didem Acet2016-11-161-8/+9
| * | | Added colored labels to related MR list.Didem Acet2016-11-163-8/+36
* | | | Merge branch 'explicitly-disable-eslint-inline' into 'master' Alfredo Sumaran2016-11-16149-148/+150
|\ \ \ \ | |_|_|/ |/| | |
| * | | explicitly disable eslint inlineexplicitly-disable-eslint-inlineLuke "Jared" Bennett2016-11-15149-148/+150
| | |/ | |/|
* | | Merge branch 'fix-failing-user-without-projects-specs' into 'master' Sean McGivern2016-11-161-1/+1
|\ \ \
| * | | Fix some failing specs due to missing access_requestable traitNick Thomas2016-11-161-1/+1
* | | | Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern2016-11-167-61/+126
|\ \ \ \
| * | | | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-167-61/+126
* | | | | Merge branch 'fix-shibboleth-auth-with-no-uid' into 'master' Rémy Coutable2016-11-162-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix shibboleth misconfigurations resulting in authentication bypassfix-shibboleth-auth-with-no-uidBrian Neel2016-11-142-0/+8
* | | | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-11-163-1/+24
|\ \ \ \ \
| * | | | | fix "Without projects" filterBen Bodenmiller2016-11-163-1/+24
* | | | | | Merge branch '23824-activity-page-does-not-show-commits-comments' into 'master' Robert Speicher2016-11-164-5/+36
|\ \ \ \ \ \
| * | | | | | Allow commit note to be visible if repo is visible23824-activity-page-does-not-show-commits-commentsRémy Coutable2016-11-164-5/+36
* | | | | | | Merge branch 'user-dropdown-multiple-requests-fix' into 'master' Fatih Acet2016-11-162-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Stopped multiple requests with dropdownsuser-dropdown-multiple-requests-fixPhil Hughes2016-11-162-1/+5
* | | | | | | | Merge branch 'issue-boards-counter-border-fix' into 'master' Fatih Acet2016-11-162-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed issue boards counter border when unauthorizedissue-boards-counter-border-fixPhil Hughes2016-11-162-1/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-1611-54/+49
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-1611-54/+49
* | | | | | | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-1611-83/+155
|\ \ \ \ \ \ \ \
| * | | | | | | | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-1611-83/+155
* | | | | | | | | Merge branch '21992-disable-access-requests-by-default' into 'master' Robert Speicher2016-11-1627-78/+122
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make access request specs explicitly enable or disable access requests as req...Nick Thomas2016-11-1124-76/+96
| * | | | | | | | | Set 'request_access_enabled' false by defaultChris Wilson2016-11-113-2/+26
* | | | | | | | | | Merge branch 'ux-guide-link-update-contributing' into 'master' Achilleas Pipinellis2016-11-161-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] Fix UX Guide link on Contributing.mdux-guide-link-update-contributingawhildy2016-11-151-4/+2
* | | | | | | | | | | Merge branch 'move-snippet-discover-spinach-test-to-rspec' into 'master' Dmitriy Zaporozhets2016-11-163-34/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move 'Explore Snippets' Spinach feature to Rspecthe-undefined2016-11-083-34/+16
* | | | | | | | | | | | Merge branch 'fix-merge-request-screen-deleted-source-branch' into 'master' Sean McGivern2016-11-163-9/+26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Do not create a MergeRequestDiff record when source branch is deletedfix-merge-request-screen-deleted-source-branchAdam Niedzielski2016-11-163-9/+26
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs-issue-24527' into 'master' Sean McGivern2016-11-163-25/+41
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Limit labels returned for a specific project as an administratorRobert Speicher2016-11-163-25/+41
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'setter-for-key' into 'master' Dmitriy Zaporozhets2016-11-163-9/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove instance vars from key model testsSemyon Pupkov2016-11-161-6/+6
| * | | | | | | | | | | Use setter for key instead AR callbackSemyon Pupkov2016-11-163-3/+18
* | | | | | | | | | | | Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' Sean McGivern2016-11-163-9/+51
|\ \ \ \ \ \ \ \ \ \ \ \