summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Simpler arguments passed to named_route on toggle_award_url helper method6967-toggle_award_urlPaco Guzman2016-10-192-2/+3
* Merge branch 'dz-start-8-14' into 'master' Dmitriy Zaporozhets2016-10-192-1/+3
|\
| * Its time for 8.14 in masterdz-start-8-14Dmitriy Zaporozhets2016-10-192-1/+3
* | Merge branch 'issue_828' into 'master' Douwe Maan2016-10-1916-83/+199
|\ \
| * | Prevent wrong markdown on issue ids when project has Jira service activatedissue_828Felipe Artur2016-10-1916-83/+199
* | | Merge branch 'update-omniauth-saml' into 'master' Douwe Maan2016-10-192-5/+5
|\ \ \
| * | | Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support ...update-omniauth-samlPatricio Cano2016-10-192-5/+5
* | | | Merge branch '22457-reset-filters-button-should-be-invisible-when-no-filters-...Robert Speicher2016-10-193-2/+15
|\ \ \ \
| * | | | Added `issuable_filters_present` to check for active filters before rendering...22457-reset-filters-button-should-be-invisible-when-no-filters-are-activeLuke Bennett2016-10-073-2/+15
* | | | | Merge branch 'dont-touch-fs-on-pipeline-save' into 'master' Rémy Coutable2016-10-192-1/+2
|\ \ \ \ \
| * | | | | Keep around commits only on pipeline createdont-touch-fs-on-pipeline-saveKamil Trzcinski2016-10-192-1/+2
* | | | | | Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-195-38/+75
|\ \ \ \ \ \
| * | | | | | Improve code that creates a list of commits for MR21444-pipeliens-new-mrGrzegorz Bizon2016-10-181-2/+3
| * | | | | | Extend merge request tests for all commits methodGrzegorz Bizon2016-10-182-20/+45
| * | | | | | Use temporary compare commits when MR not persistedGrzegorz Bizon2016-10-181-11/+9
| * | | | | | Extract pipeline vars in merge requests controllerGrzegorz Bizon2016-10-182-6/+14
| * | | | | | Use all pipelines variable when creating merge requestGrzegorz Bizon2016-10-182-6/+6
| * | | | | | Remove obsolete variable assigned to MR widget viewGrzegorz Bizon2016-10-181-1/+0
| * | | | | | Fix variable to show multiple pipelines for MRAnnabel Dunstone Gray2016-10-182-2/+1
| * | | | | | Fix pipeline tab content display and badge countAnnabel Dunstone Gray2016-10-181-1/+1
| * | | | | | Add pipelines tab to new MRAnnabel Dunstone2016-10-181-0/+7
* | | | | | | Merge branch 'fix/fix-public-builds-name-in-pipeline-settings' into 'master' Achilleas Pipinellis2016-10-191-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix name of feature that restricts builds tracesfix/fix-public-builds-name-in-pipeline-settingsGrzegorz Bizon2016-10-191-2/+2
* | | | | | | Merge branch 'corrected-build-page-header-username-to-full-name' into 'master' Jacob Schatz2016-10-191-2/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Change username full name back to only username on xs viewportscorrected-build-page-header-username-to-full-nameLuke Bennett2016-09-081-3/+5
| * | | | | | Changed build header username area to use the full name with the username as ...Luke Bennett2016-09-081-1/+2
* | | | | | | Merge branch 'fix-escaping' into 'master' Sean McGivern2016-10-193-1/+7
|\ \ \ \ \ \ \
| * | | | | | | fix: commit messages being double-escaped in activies tabamaia2016-10-183-1/+7
* | | | | | | | Merge branch 'rs-revert-title-change' into 'master' Douwe Maan2016-10-195-5/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Use `to_reference` for Issue "show" and "edit" page titlesrs-revert-title-changeRobert Speicher2016-10-192-2/+2
| * | | | | | | Revert "Merge branch 'gjlaubenstein/gitlab-ce-21712-change-issue-show-html-ti...Robert Speicher2016-10-195-5/+4
* | | | | | | | Merge branch 'dz-refactor-some-specs' into 'master' Sean McGivern2016-10-192-86/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor group_members_controller_specdz-refactor-some-specsDmitriy Zaporozhets2016-10-192-86/+35
| |/ / / / / / /
* | | | | | | | Merge branch 'grapify-commit-statuses-api' into 'master' Rémy Coutable2016-10-192-28/+29
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Grapify the commit status APIgrapify-commit-statuses-apiRobert Schilling2016-10-192-28/+29
* | | | | | | | Merge branch 'fix-system-hook-api' into 'master' Rémy Coutable2016-10-193-14/+10
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | API: Fix Sytem hooks delete behaviorfix-system-hook-apiRobert Schilling2016-10-143-14/+10
* | | | | | | | Merge branch 'sh-improve-merge-service-logging' into 'master' Robert Speicher2016-10-192-6/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Identify merge request project and IID in log messagesh-improve-merge-service-loggingStan Hu2016-10-181-1/+7
| * | | | | | | | Improve error logging of MergeServiceStan Hu2016-10-182-6/+12
* | | | | | | | | Merge branch 'sh-fix-broken-note-award-emoji' into 'master' Robert Speicher2016-10-192-6/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add spec for toggling award emoji on issue notessh-fix-broken-note-award-emojiStan Hu2016-10-181-5/+41
| * | | | | | | | | Fix broken award emoji for commentsStan Hu2016-10-181-1/+1
* | | | | | | | | | Merge branch 'backport-git-access-spec-changes' into 'master' Douwe Maan2016-10-191-6/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Backport git access spec changes from EEbackport-git-access-spec-changesSean McGivern2016-10-181-6/+6
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-1933-102/+657
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1838-218/+506
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Merge two scenarios into oneKamil Trzcinski2016-10-181-8/+2
| * | | | | | | | | Fix remaining offensesKamil Trzcinski2016-10-182-4/+5
| * | | | | | | | | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-183-1/+77