summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix empty/no results filenames [ci-skip]add-error-tracking-list-viewSimon Knox2018-12-113-2/+6
* Merge branch 'add-error-tracking-list-view' of gitlab.com:gitlab-org/gitlab-c...Simon Knox2018-12-112-0/+32
|\
| * Add error tracking list viewJose Vargas2018-12-117-0/+66
* | add some empty statesSimon Knox2018-12-115-2/+24
* | Add error tracking list viewJose Vargas2018-12-115-0/+34
|/
* Merge branch '55138-fix-mr-discussions-count' into 'master'Phil Hughes2018-12-113-28/+50
|\
| * Fix MR discussion counts being offPaul Slaughter2018-12-103-28/+50
* | Merge branch '11-6-update-gitignore' into 'master'Robert Speicher2018-12-1012-101/+102
|\ \
| * | Update the .gitignoreAlex Hanselka2018-12-1012-101/+102
| |/
* | Merge branch '11-6-update-license' into 'master'Robert Speicher2018-12-101-56/+98
|\ \
| * | Update License info for 11.6 feature freezeAlex Hanselka2018-12-101-56/+98
| |/
* | Merge branch 'ichernikov/add-asignee-to-mr' into 'master'Mark Lapierre2018-12-106-2/+22
|\ \
| * | Extended MR spec to set assigneeichernikov-add-assignee-to-mrievgenChernikov2018-12-106-2/+22
* | | Merge branch 'upgrade-to-workhorse-7.6.0' into 'master'Robert Speicher2018-12-102-1/+6
|\ \ \
| * | | Upgrade to workhorse 7.6.0:Andrew Newdigate2018-12-102-1/+6
|/ / /
* | | Merge branch 'sh-json-serialize-broadcast-messages' into 'master'Robert Speicher2018-12-103-4/+80
|\ \ \ | |_|/ |/| |
| * | Avoid caching BroadcastMessage as an ActiveRecord objectStan Hu2018-12-083-4/+80
* | | Merge branch 'sh-bump-sentry-raven-gem' into 'master'Robert Speicher2018-12-101-1/+1
|\ \ \
| * | | Bump sentry-raven gem to 2.7.4Stan Hu2018-12-101-1/+1
* | | | Merge branch 'profile-fixing' into 'master'Annabel Dunstone Gray2018-12-103-8/+16
|\ \ \ \
| * | | | Add bottom margin depends on profile tabs visibility.Harry Kiselev2018-12-102-2/+6
| * | | | Remove unnecessary paddings at profile user bio block.Harry Kiselev2018-12-102-1/+5
| * | | | Fix profile_header bottom margin, #51807.Harry Kiselev2018-12-102-6/+6
* | | | | Merge branch '49713-main-navbar-is-broken-in-certain-viewport-widths' into 'm...Annabel Dunstone Gray2018-12-107-23/+34
|\ \ \ \ \
| * | | | | Resolve main nav clipping in certain breakpointsDennis Tang2018-12-107-23/+34
* | | | | | Merge branch 'fail-danger-in-ci' into 'master'Rémy Coutable2018-12-101-1/+0
|\ \ \ \ \ \
| * | | | | | Don't allow Danger to fail in CI any moreYorick Peterse2018-12-101-1/+0
* | | | | | | Merge branch '55116-runtimeerror-can-t-modify-frozen-string' into 'master'Douwe Maan2018-12-103-1/+12
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix a frozen string error in lib/gitlab/utils.rbRémy Coutable2018-12-103-1/+12
* | | | | | | Merge branch 'sh-remove-gitlab-shell-include' into 'master'Rémy Coutable2018-12-1012-16/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary includes of ShellAdapterStan Hu2018-12-0512-16/+2
* | | | | | | | Merge branch 'winh-timecop-frontend-fixtures' into 'master'Rémy Coutable2018-12-101-0/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Set a fixed date for frontend fixturesWinnie Hellmann2018-12-101-0/+7
* | | | | | | | Merge branch 'backport-ee-helper-changes' into 'master'Robert Speicher2018-12-102-0/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Backport some EE helper changesYorick Peterse2018-12-062-0/+14
* | | | | | | | Merge branch 'dimitrieh-master-patch-42734' into 'master'Robert Speicher2018-12-101-2/+10
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Improve feature proposal template for improved product thinkingDimitrie Hoekstra2018-12-101-2/+10
|/ / / / / / /
* | | | | | | Merge branch '55104-frozenerror-can-t-modify-frozen-string' into 'master'Douwe Maan2018-12-103-3/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix a frozen string error in app/mailers/notify.rbRémy Coutable2018-12-103-3/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'winh-dropdown-item-padding' into 'master'Kushal Pandya2018-12-105-20/+14
|\ \ \ \ \ \ \
| * | | | | | | Adjust dropdown item and header padding to comply with design specsWinnie Hellmann2018-12-105-20/+14
|/ / / / / / /
* | | | | | | Merge branch '55090-fix-group-clusters-no-project-namespace' into 'master'Kamil Trzciński2018-12-104-6/+178
|\ \ \ \ \ \ \
| * | | | | | | Extract Clusters::BuildServiceDylan Griffith2018-12-103-21/+52
| * | | | | | | Refactor to re-use similar blockThong Kuah2018-12-101-3/+9
| * | | | | | | Set cluster_type for a new clusterThong Kuah2018-12-101-0/+9
| * | | | | | | Add failing feature specThong Kuah2018-12-101-0/+126
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'qa-reuse-chrome-profile' into 'master'Sanad Liaquat2018-12-102-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Add option to use the same Chrome profileThong Kuah2018-12-062-0/+12
* | | | | | | | Merge branch '39727-registry' into 'master'Phil Hughes2018-12-1010-208/+166
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused codeFilipa Lacerda2018-12-071-4/+2