summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use captuer and concat in helper49403-redesign-activity-feedMartin Wortschack2018-11-051-8/+3
|
* Adds reusable line-height variableMartin Wortschack2018-11-032-1/+2
|
* Revert font-size and fix alignmentMartin Wortschack2018-11-037-11/+6
|
* Resolve discussionsMartin Wortschack2018-11-033-8/+5
|
* Merge branch '49403-redesign-activity-feed' of ↵Martin Wortschack2018-11-021-1/+1
|\ | | | | | | gitlab.com:gitlab-org/gitlab-ce into 49403-redesign-activity-feed
| * Update changelogMartin Wortschack2018-11-021-1/+1
| |
* | Resolve FE discussionsMartin Wortschack2018-11-026-29/+15
|/
* Adds utility classMartin Wortschack2018-11-021-1/+1
|
* Adds utility classes to templates, removes unused CSSMartin Wortschack2018-11-027-35/+17
|
* Fix linting errorMartin Wortschack2018-11-021-2/+2
|
* Resolve UX discussionsMartin Wortschack2018-11-024-16/+15
|
* Fix broken testMartin Wortschack2018-11-011-1/+1
|
* Adds whitespace between author and usernameMartin Wortschack2018-11-012-3/+1
|
* Adds event target title to relevant event partialsMartin Wortschack2018-11-015-27/+11
|
* Resolve UX discussionsMartin Wortschack2018-11-0112-34/+102
|
* Merge branch 'master' into 49403-redesign-activity-feedMartin Wortschack2018-10-31692-5128/+11689
|\
| * Merge branch 'fix-53298' into 'master'Dmitriy Zaporozhets2018-10-302-1/+6
| |\ | | | | | | | | | | | | | | | | | | Fix #53298 JupyterHub restarts should work without errors Closes #53298 See merge request gitlab-org/gitlab-ce!22671
| | * Adding changelog entryAmit Rathi2018-10-301-0/+5
| | |
| | * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceAmit Rathi2018-10-3026-341/+301
| | |\
| | * | Fix #53298: JupyterHub to restarts should work without errorsAmit Rathi2018-10-301-1/+1
| | | |
| * | | Merge branch 'mlapierre-master-patch-47853' into 'master'Marin Jankovski2018-10-301-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix Review Apps testing guide See merge request gitlab-org/gitlab-ce!22670
| | * | | Fix Review Apps testing guidemlapierre-master-patch-47853Mark Lapierre2018-10-291-3/+3
| | | | | | | | | | | | | | | Changes from docs review
| * | | | Merge branch 'rename-secret-variables-1' into 'master'Grzegorz Bizon2018-10-3025-64/+69
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming Secret Variables in the codebase Closes #49629 See merge request gitlab-org/gitlab-ce!22414
| | * | | | Renaming Secret Variables in the codebaseMarcel Amirault2018-10-3025-64/+69
| |/ / / /
| * | | | Merge branch 'qa-filter-comments-in-issues' into 'master'Grzegorz Bizon2018-10-303-15/+55
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding tests for filtering activities/comments in issues Closes #51889 See merge request gitlab-org/gitlab-ce!22564
| | * | | | Adding tests for filtering activities/comments in issuesRamya Authappan2018-10-303-15/+55
| |/ / / /
| * | | | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-10-3023-59/+66
| |\ \ \ \
| | * \ \ \ Merge branch 'bw-fix-spec-in-merge' into 'master'Stan Hu2018-10-301-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problem with spec that showed up in EE merge See merge request gitlab-org/gitlab-ce!22675
| | | * | | | Fix problem with spec that showed up in EE mergeBrett Walker2018-10-291-1/+1
| | | | | | |
| | * | | | | Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' ↵Evan Read2018-10-301-0/+6
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' docs: Add deprecation notice for renamed licensed feature See merge request gitlab-org/gitlab-ce!22575
| | | * | | | Add deprecation notice for renamed licensed featuredocs-add_deprecation_notice_for_renamed_licensed_feature-ceOlivier Gonzalez2018-10-241-0/+6
| | | | | | |
| | * | | | | Merge branch 'patch-31' into 'master'Evan Read2018-10-301-0/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a note about machine types See merge request gitlab-org/gitlab-ce!22572
| | | * | | | | Added a note about machine typesMark Veenstra2018-10-301-0/+3
| | |/ / / / /
| | * | | | | Merge branch 'update-gitlab-ui' into 'master'Mike Greiling2018-10-2916-51/+51
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-ui to 1.9.0 See merge request gitlab-org/gitlab-ce!22632
| | | * | | | | Update gitlab-ui to 1.9.0Clement Ho2018-10-2916-51/+51
| | |/ / / / /
| | * | | | | Merge branch '53270-remove-mousetrap-rails' into 'master'Mike Greiling2018-10-294-7/+5
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mousetrap-rails gem Closes #53270 See merge request gitlab-org/gitlab-ce!22647
| | | * | | | | Remove mousetrap-rails gemTakuya Noguchi2018-10-284-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-29406-3204/+6889
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-2925-47/+55
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make new merge request URL more friendly when pushing code Closes #53012 See merge request gitlab-org/gitlab-ce!22526
| | | * | | | | Revert _diffs.html.hamlblackst0ne-update-push-new-merge-request-urlblackst0ne2018-10-271-1/+0
| | | | | | | |
| | | * | | | | Fix specsblackst0ne2018-10-268-16/+17
| | | | | | | |
| | | * | | | | Update other linksblackst0ne2018-10-2614-23/+25
| | | | | | | |
| | | * | | | | Make new merge request URL more friendly when pushing codeblackst0ne2018-10-236-9/+15
| | | | | | | |
| | * | | | | | Merge branch 'ml-qa-push-private-token' into 'master'Dan Davison2018-10-292-1/+33
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Add e2e test to push using a private token See merge request gitlab-org/gitlab-ce!22628
| | | * | | | | Add e2e test to push using a private tokenml-qa-push-private-tokenMark Lapierre2018-10-292-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests pushing over HTTP(S) using a personal access token
| | * | | | | | Merge branch '53273-update-moment-to-2-22-2' into 'master'Mike Greiling2018-10-292-6/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update moment to 2.22.2 Closes #53273 See merge request gitlab-org/gitlab-ce!22648
| | | * | | | | | Update moment to 2.22.2Takuya Noguchi2018-10-282-6/+6
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| | * | | | | | Merge branch 'pages-1-3-0' into 'master'Robert Speicher2018-10-291-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Pages to v1.3.0 See merge request gitlab-org/gitlab-ce!22666
| | | * | | | | | Update GitLab Pages to v1.3.0Nick Thomas2018-10-291-1/+1
| | | | | | | | |
| | * | | | | | | Merge branch 'rails5-deprecated-uniq' into 'master'Robert Speicher2018-10-296-6/+11
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace deprecated uniq on a Relation with distinct See merge request gitlab-org/gitlab-ce!22625