summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 8.1.4v8.1.4Robert Speicher2015-11-101-1/+1
|
* Revert "Merge branch 'accept_mr_btn_ci_status' into 'master'"Robert Speicher2015-11-102-17/+1
| | | | This reverts commit aab713c121a1c9de0e52e253601ee304f3deff6b.
* Merge branch 'rs-remove-text-rendering' into 'master' Robert Speicher2015-11-101-1/+0
| | | | | | | | | | | Remove text-rendering property Continues !1779 Closes #3220 [ci skip] See merge request !1784
* Merge branch 'fix-tabs-not-rendering-in-chromium-45' into 'master'Robert Speicher2015-11-102-1/+1
| | | | | | | | | | | Remove CSS property preventing hard tabs from rendering in Chromium 45 This is to workaround a bug in Chromium 45 (https://code.google.com/p/chromium/issues/detail?id=446434), which is the default browser in Ubuntu 14.04 and older. Closes #3220 See merge request !1779
* Merge branch 'accept_mr_btn_ci_status' into 'master'Dmitriy Zaporozhets2015-11-103-1/+18
| | | | | | | | | | | | | | | | | | | | Merge button has color from CI status This MR closes #3313 I'am not realy sure about the color for the skipped status (red)... UI changes: ![accpet-mr-ci-failed](/uploads/c03970c468b89e38ed2c5e3171f53505/accpet-mr-ci-failed.png) ![accpet-mr-ci-skipped](/uploads/f29cbc69e77cc95b33522135b327cc51/accpet-mr-ci-skipped.png) ![accpet-mr-ci-pending](/uploads/79612a66fd497174e00bd348c9cba69c/accpet-mr-ci-pending.png) ![accpet-mr-ci-success](/uploads/4b601e6d02b860db5ff53c47c98f3206/accpet-mr-ci-success.png) See merge request !1761
* Merge branch 'fix-incoming-email-default' into 'master'Robert Speicher2015-11-092-2/+3
| | | | | | | | Fix incoming email config defaults Fixes #3377. See merge request !1766
* Update CHANGELOGRobert Speicher2015-11-091-1/+0
| | | | [ci skip]
* Update CHANGELOGRobert Speicher2015-11-091-24/+2
| | | | [ci skip]
* Merge branch 'fix-commits-manual-merge' into 'master' Douwe Maan2015-11-093-4/+49
| | | | | | | | | | | | | | | | | Fix bug where manually merged branches in a MR would end up with an empty diff This bug manifested in 8.1 with the refactoring of `RefreshService`. Here's what happens: 1. User create a new branch `foo`. 2. User creates a merge request for `foo`. 3. User merges `foo` into `master` by hand. 4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff. 5. `RefreshService` then closes the MR. This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens. Closes #3314 See merge request !1758
* Merge branch 'fix-infinite-redirect' into 'master' Stan Hu2015-11-091-7/+15
| | | | | | | | | | | | | | Only redirect to homepage url when its not the root url It was possible to create an infi redirect when the user set up the `home_page_url` to redirect to the main URL of the gitlab instance. This fix makes sure this redirect is not possible. Fixes #1020 /cc @dblessing See merge request !1703
* Version 8.1.3v8.1.3Robert Speicher2015-11-051-1/+1
|
* Merge branch 'facebook-auth' into 'master' Robert Speicher2015-11-0412-14/+126
| | | | | Add Facebook authentication See merge request !1740
* Update CHANGELOG for 8.1.3Robert Speicher2015-11-041-17/+2
| | | | [ci skip]
* Use issue editor as cross reference comment author when issue is edited with ↵Douwe Maan2015-11-044-3/+16
| | | | a new mention.
* Merge branch 'spread-runner-last-updated-at' into 'master' Robert Speicher2015-11-042-1/+7
| | | | | | | | Spread out runner contacted_at updates This is meant to prevent having too many concurrent UPDATE requests caused by runners checking in. See merge request !1722
* Merge branch 'fix-issue-3138' into 'master'Douwe Maan2015-10-312-1/+4
| | | | | | | | | | Force update refs/merge-requests/X/head upon a push to the source branch of a merge request If a user rebases and does a force push, GitLab would not update the `refs/merge-requests/X/head` link. Using the -f flag forces this to happen. Closes #3138 See merge request !1683
* Version 8.1.2v8.1.2Robert Speicher2015-10-271-1/+1
|
* Update CHANGELOG for 8.1.2Robert Speicher2015-10-271-1/+5
| | | | [ci skip]
* Merge branch 'add-project-path-index' into 'master' Robert Speicher2015-10-272-1/+11
| | | | | | | Add projects path index Fixes performance regression introduced by !1649 See merge request !1692
* Version 8.1.1v8.1.1Robert Speicher2015-10-261-1/+1
|
* Merge branch 'fix-ci-badge' into 'master'Robert Speicher2015-10-264-15/+12
| | | | | | | | | | Fix CI badge The previous code relied on having on ref stored in commit, however the ref was moved to the build. Fixes #3104 See merge request !1690
* Update CHANGELOGRobert Speicher2015-10-261-3/+3
| | | | [ci skip]
* Merge branch 'fix-specific-runner-visibility' into 'master'Robert Speicher2015-10-264-24/+20
| | | | | | Fix visibility of specific runners See merge request !1688
* Update CHANGELOGRobert Speicher2015-10-261-1/+4
| | | | [ci skip]
* Merge branch 'remove-satellites' into 'master' Robert Speicher2015-10-264-4/+25
| | | | | Add migration to remove the contents of the satellites dir See merge request !1681
* Merge pull request #9749 from Bufallo/fix-redis-checkStan Hu2015-10-261-1/+1
| | | Fix regex in redis version check
* Remove "install schedules" step from Installation guideRobert Speicher2015-10-241-5/+0
| | | | [ci skip]
* Merge branch 'fix-ci-regressions' into 8-1-stableKamil Trzcinski2015-10-2313-31/+58
|\
| * Fail builds that also have empty stringKamil Trzcinski2015-10-232-1/+6
| |
| * Fix broken Runners admin pageKamil Trzcinski2015-10-232-12/+19
| |
| * On CI Admin page show only projects that are present in GitLabKamil Trzcinski2015-10-231-0/+1
| |
| * Allow developer to manage buildsKamil Trzcinski2015-10-233-10/+17
| |
| * Fix small CI UI regressionsKamil Trzcinski2015-10-236-8/+15
| |
* | Merge branch 'fix-wiki-clone-over-http' into 'master' Robert Speicher2015-10-233-1/+35
|/ | | | | | | | | | Fix cloning Wiki repositories via HTTP Cloning a project Wiki over HTTP would end up cloning the main repository since the .wiki extension was being stripped. Closes #3106 See merge request !1676
* Merge branch '8-1-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-1-stableRobert Speicher2015-10-223-6/+8
|\
| * Merge branch 'fix-edit-readme' into '8-1-stable' Robert Speicher2015-10-223-6/+8
| |\ | | | | | | | | | | | | Fix edit readme link on project home page See merge request !1668
| | * Fix edit readme link on project home pagefix-edit-readmeDmitriy Zaporozhets2015-10-223-6/+8
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'project-path-case-sensitivity' into 'master' Robert Speicher2015-10-224-12/+35
| | | | | | | | | | | | | | Prefer project with exact path to differently cased one when both exist. Fixes #3113. See merge request !1649
* | Merge branch 'fix-ci-services-editing' into 'master' Robert Speicher2015-10-222-4/+5
| | | | | | | | | | | | | | Fix 500 when editing CI services Fixes #3090 See merge request !1663
* | Merge branch 'fail-on-empty-job-name' into 'master' Robert Speicher2015-10-223-15/+38
| | | | | | | | | | | | | | Require jobs to be named This properly presents error for .gitlab-ci.yml having empty job name. See merge request !1662
* | Merge branch 'fix-css-for-runner' into 'master' Robert Speicher2015-10-222-27/+26
|/ | | | | | | Fix CSS class for runner status Fixes #3117 See merge request !1665
* Version 8.1.0v8.1.0Robert Speicher2015-10-221-1/+1
|
* Update CHANGELOGRobert Speicher2015-10-221-1/+1
| | | | [ci skip]
* Merge branch 'fix-issue-3094' into 'master' Valery Sizov2015-10-222-41/+45
| | | | | | | | | | | | | | | Don't show "Add README" link in an empty repository if user doesn't have access to push Reporter users would see this before even though they didn't have access to push: ![image](/uploads/1dd328ab7e58cd00c5b696f079816e16/image.png) It's not complete accurate to include the push command-line instructions, but users may still want the instructions to clone. After: ![image](/uploads/3d214e140916d2f174d0b5fec0ac472d/image.png) Closes #3094 See merge request !1626
* Merge branch 'dm-issue-3140' into 'master' Robert Speicher2015-10-222-28/+49
| | | | | | | Make sure MR refresh service correctly determines newly added commits. Fixes #3140. See merge request !1659
* Merge branch 'fix-build-trace-updating' into 'master' Robert Speicher2015-10-223-2/+3
| | | | | | | Fix build trace updating Fixes #2910 See merge request !1657
* Merge branch 'remove-ci-migration' into 'master' Robert Speicher2015-10-226-297/+1
| | | | | Remove CI migration See merge request !1656
* Version 8.1.0.rc2v8.1.0.rc2Robert Speicher2015-10-211-1/+1
|
* Merge branch 'animated-logo' into 'master'Dmitriy Zaporozhets2015-10-215-10/+49
| | | | | | | | | | | | | | Animate the logo on hover The logo is now rendered as pure SVG, rather than image referencing a svg. The SVG has an id and the shapes of the logo have a shared class. The shapes change their fill color on hover with a transition. Identical to how it looks on about.gitlab.com cc @skyruler See merge request !1557
* Merge branch 'markdown-tabs-margin' into 'master' Robert Speicher2015-10-211-4/+1
| | | | | | | Fix margin around Markdown Write/Preview tabs. Reverts !1354 and uses another fix for #2585. See merge request !1654