summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use `sign_in` instead of `login_as` when we're not testing login flowrs-sign-in-pocRobert Speicher2017-03-281-9/+11
* Merge branch 'tc-api-remove-comments-endpoint' into 'master' Rémy Coutable2017-03-287-148/+68
|\
| * API: Make the /notes endpoint work with noteable iid instead of idToon Claes2017-03-275-55/+68
| * Remove `:id/merge_requests/:merge_request_iid/comments` endpointsToon Claes2017-03-272-93/+0
* | Merge branch '5983-poll-changes' into 'master' Jacob Schatz2017-03-282-14/+81
|\ \
| * | Parses string header into a numberFilipa Lacerda2017-03-281-1/+1
| * | Changes after reviewFilipa Lacerda2017-03-241-7/+9
| * | Adds restart method and auxiliar callback to polling classFilipa Lacerda2017-03-242-10/+75
* | | Merge branch 'calendar-tooltips' into 'master' Rémy Coutable2017-03-282-2/+6
|\ \ \
| * | | Add tooltip to user's calendar activitiesalex argunov2017-03-222-2/+6
* | | | Merge branch 'issuable-sidebar-collapsed-labels-icon' into 'master' Filipa Lacerda2017-03-282-1/+7
|\ \ \ \
| * | | | Fixed labels icon being hidden in collapsed issuable sidebarPhil Hughes2017-03-282-1/+7
|/ / / /
* | | | Merge branch '30098-banzai-filter-mergerequestreferencefilter-has-an-n-1-quer...Yorick Peterse2017-03-284-2/+57
|\ \ \ \
| * | | | Add changelog entryRémy Coutable2017-03-281-0/+4
| * | | | Get rid of a third N+1 query problemRémy Coutable2017-03-281-1/+3
| * | | | Get rid of second N+1 query problemRémy Coutable2017-03-281-0/+4
| * | | | Get rid of a first N+1 query problemRémy Coutable2017-03-281-2/+21
| * | | | Add N+1 query problem specs for Issue and MergeRequest ReferenceFilter classesRémy Coutable2017-03-282-0/+26
* | | | | Merge branch 'fix-actually-use-knapsack-for-branches-other-than-master' into ...Kamil Trzciński2017-03-281-2/+2
|\ \ \ \ \
| * | | | | Don't include branch name in Knapsack report fileRémy Coutable2017-03-281-2/+2
* | | | | | Merge branch 'user-callout-refactor' into 'master' Filipa Lacerda2017-03-289-77/+87
|\ \ \ \ \ \
| * | | | | | Refactored the user callout classPhil Hughes2017-03-249-77/+87
* | | | | | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-2810-37/+13
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOG.md for 9.0.1DJ Mountney2017-03-2810-37/+13
* | | | | | | | Merge branch '10120-remove-spread-string-for-array-from' into 'master' Filipa Lacerda2017-03-282-55/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove spreadString in favor of polyfilled Array.from10120-remove-spread-string-for-array-fromEric Eastwood2017-03-242-55/+3
* | | | | | | | Merge branch 'fix/gb/environments-folders-route' into 'master' Kamil Trzciński2017-03-285-1/+106
|\ \ \ \ \ \ \ \
| * | | | | | | | Add controller specs for environment folder actionGrzegorz Bizon2017-03-271-0/+33
| * | | | | | | | Add routing specs for environment foldersGrzegorz Bizon2017-03-271-0/+49
| * | | | | | | | Add changelog entry for environment folder route fixGrzegorz Bizon2017-03-271-0/+4
| * | | | | | | | Fix environment folder route when special chars presentGrzegorz Bizon2017-03-272-1/+20
* | | | | | | | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update VERSION to 9.1.0-prev9.1.0.preJames Lopez2017-03-221-1/+1
* | | | | | | | | | Merge branch 'issue-boards-assignee-tooltip-aligment' into 'master' Annabel Dunstone Gray2017-03-281-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed alignment of tooltip on card assigneePhil Hughes2017-03-281-0/+5
* | | | | | | | | | | Merge branch 'fixed-issue-boards-sidebar-alignment' into 'master' Annabel Dunstone Gray2017-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed issue boards sidebar alignmentPhil Hughes2017-03-281-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'issue-boards-card-img-triggers-sidebar' into 'master' Filipa Lacerda2017-03-283-6/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Stops triggering board sidebar when clicking avatarPhil Hughes2017-03-283-6/+23
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch '30172-fix-mattermost-enabled-setting-not-properly-stubbed' into...Sean McGivern2017-03-284-3/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Add a new `stub_mattermost_setting` stub helper to properly stub Mattermost s...Rémy Coutable2017-03-284-3/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '29874-support-wider-range-of-monitored-environments-with-promet...Rémy Coutable2017-03-283-7/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Support wider range of monitored environments with PrometheusJoshua Lambert2017-03-283-7/+7
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-ee_compat_check' into 'master' Sean McGivern2017-03-281-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`Rémy Coutable2017-03-281-2/+2
* | | | | | | | | Merge branch 'rs-empty-project-services' into 'master' Rémy Coutable2017-03-2855-119/+143
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use `:empty_project` where possible in service specsRobert Speicher2017-03-2755-119/+143
| |/ / / / / / / /
* | | | | | | | | Merge branch '23363-use-strong-params-in-wikis-controller' into 'master' Rémy Coutable2017-03-282-1/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update wikis_controller.rb to use strong paramsKeifer Furzland2017-03-252-1/+5
* | | | | | | | | Merge branch 'fix-knapsack' into 'master' Robert Speicher2017-03-271-2/+2
|\ \ \ \ \ \ \ \ \