summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into dz-codeclimate-comparedz-codeclimate-compareDmitriy Zaporozhets2017-05-25184-1566/+2926
|\
| * Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-05-252-1/+33
| |\
| | * Remove shared example and improve sub_group_issuables_spec.rbfix-filtered-search-issuable-empty-state-exceptionLuke "Jared" Bennett2017-05-252-22/+17
| | * Remove 'should' from scenario in has_subgroup_title_spec.rbLuke "Jared" Bennett2017-05-251-1/+1
| | * Added specs to test for subgroup titles on issue and mr pagesLuke "Jared" Bennett2017-05-122-0/+37
| | * Check for filtered-search before constructing filteredsearchmanagerLuke "Jared" Bennett2017-05-121-1/+1
| * | Merge branch 'add-back-margin-to-note-text' into 'master'Annabel Dunstone Gray2017-05-251-6/+0
| |\ \
| | * | Remove 0 margin bottom for last paragraph on note textadd-back-margin-to-note-texttauriedavis2017-05-241-6/+0
| * | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-2532-788/+804
| |\ \ \
| | * | | Remove extra spacerevert-b0498c17Douwe Maan2017-05-241-1/+1
| | * | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-2432-788/+804
| * | | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-05-255-15/+47
| |\ \ \ \
| | * | | | Fix terminals support for Kubernetes serviceKamil Trzcinski2017-05-255-15/+47
| * | | | | Merge branch 'grpc-1.3.4' into 'master'Douwe Maan2017-05-251-1/+1
| |\ \ \ \ \
| | * | | | | Use grpc 1.3.4Jacob Vosmaer2017-05-231-1/+1
| * | | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-2548-289/+880
| |\ \ \ \ \ \
| | * | | | | | Implement web hooks loggingAlexander Randa2017-05-2548-289/+880
| * | | | | | | Merge branch 'zj-faster-image-trigger-builds' into 'master'Marin Jankovski2017-05-251-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Use smaller image when triggering a buildzj-faster-image-trigger-buildsZ.J. van de Weg2017-05-241-0/+1
| * | | | | | | | Merge branch 'correct-compare_spec-transient' into 'master'Grzegorz Bizon2017-05-251-1/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add review comments to compare_spec.rbLuke "Jared" Bennett2017-05-251-0/+2
| | * | | | | | | | Fix transient error clicking dropdown items in compare_spec.rbLuke "Jared" Bennett2017-05-251-1/+3
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'update-helm-source-ip-docs' into 'master'Achilleas Pipinellis2017-05-251-1/+35
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add notes to the kubernetes install docs regarding source IPsupdate-helm-source-ip-docsDJ Mountney2017-05-241-1/+35
| * | | | | | | | | Merge branch 'mrchrisw-add-mr-stats' into 'master'Achilleas Pipinellis2017-05-252-0/+8
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Add docs on milestone percentage statsmrchrisw-add-mr-statsChris Wilson2017-05-252-0/+8
| * | | | | | | | | Merge branch '32850-award-emoji-off' into 'master'Phil Hughes2017-05-251-2/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix alignment of hover state on emoji button32850-award-emoji-offAnnabel Dunstone Gray2017-05-241-2/+3
| * | | | | | | | | | Merge branch '32807-company-icon' into 'master'Phil Hughes2017-05-252-1/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Use briefcase icon for company32807-company-iconAnnabel Dunstone Gray2017-05-242-1/+5
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'fix-raven-jquery-dep' into 'master'Phil Hughes2017-05-252-19/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Use non-global jQuery reference within raven bundleLuke "Jared" Bennett2017-05-252-19/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'feature/rss-scoped-token' into 'master'Douwe Maan2017-05-2438-99/+280
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | extract partialAlexis Reigel2017-05-242-24/+14
| | * | | | | | | | | user can reset his rss token on the account pageAlexis Reigel2017-05-245-4/+40
| | * | | | | | | | | remove dead codeAlexis Reigel2017-05-241-9/+4
| | * | | | | | | | | create User#rss_token in user factory explicitelyAlexis Reigel2017-05-241-0/+4
| | * | | | | | | | | ensure rss token on readAlexis Reigel2017-05-242-4/+13
| | * | | | | | | | | use full caps RSS instead of rssAlexis Reigel2017-05-2420-48/+48
| | * | | | | | | | | add changelogAlexis Reigel2017-05-241-0/+4
| | * | | | | | | | | atom links with rss token instead of private tokenAlexis Reigel2017-05-2423-72/+162
| | * | | | | | | | | add missing spec for incoming email token presenceAlexis Reigel2017-05-241-0/+7
| | * | | | | | | | | rake task to reset all rss tokensAlexis Reigel2017-05-242-0/+16
| | * | | | | | | | | add rss_token attribute to user modelAlexis Reigel2017-05-245-2/+32
| * | | | | | | | | | Merge branch '32799-remove-no_turbolink-attribute-from-haml' into 'master'Robert Speicher2017-05-244-7/+11
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Remove redundant data-turbolink attributes from linksblackst0ne2017-05-254-7/+11
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'winh-ajax-filter-cache' into 'master'Clement Ho2017-05-241-36/+11
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Use AjaxCache in Droplab AjaxFilterwinh-ajax-filter-cachewinh2017-05-241-36/+11
| * | | | | | | | | Merge branch 'dm-copy-gfm-when-parts-of-other-elements-are-selected' into 'ma...Filipa Lacerda2017-05-244-8/+45
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Add specDouwe Maan2017-05-241-0/+19
View Lorry Controller Status