Commit Graph
23968 Commits
Author SHA1 Message Date
Jacob SchatzandRémy Coutable 1f368f2bc3 Merge branch 'milestone-drag-empty-list' into 'master'
Issues can be dragged & dropped into empty milestone lists

This is also possible with MRs. Also fixed an issue where MRs weren't sortable

Fixes #13668

![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif)

See merge request !2935
2016-02-23 14:08:29 +01:00
Rémy Coutable 810ec4e57a Add 8.5.1 changes to CHANGELOG 2016-02-23 11:38:14 +01:00
Rémy Coutable 08ac2f2956 Merge branch 'fix/13631-error-with-merged-mr' into 'master'
Ensure we don't check a commit's description for revert message if it has no description

Fixes #13631.

/cc @razer6 @grzesiek @yorickpeterse @rdavila 

See merge request !2917
2016-02-23 11:29:33 +01:00
Jacob SchatzandRémy Coutable 29ad1cedef Merge branch 'issue_13463' into 'master'
Fix Side-by-side view after loading diff results

Fixes #13463

See merge request !2880
2016-02-23 11:29:18 +01:00
Achilleas PipinellisandRémy Coutable 3e8f98aa64 Merge branch 'add_missing_doc' into 'master'
Add when the API changes got introduced



See merge request !2912
2016-02-23 11:29:00 +01:00
Rémy Coutable b79c932b10 Merge branch 'fix-failing-issue-tests' into 'master'
Fixed failing issues tests

Also removed up/down vote icons from merge requests. Was missed from d8069bd858

See merge request !2911
2016-02-23 11:28:48 +01:00
Rémy Coutable af84bec603 Remove "(unreleased)" from CHANGELOG
[ci skip]
2016-02-22 12:38:57 +01:00
Rémy Coutable a513e09d8c Version 8.5.0 v8.5.0 2016-02-22 11:48:40 +01:00
Rémy Coutable 31986354ab Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master'
Only show up or down votes icon on issue list if there are any

Closes #13649 

![Screen_Shot_2016-02-22_at_10.20.27](/uploads/21477426856dab9731bb110032025867/Screen_Shot_2016-02-22_at_10.20.27.png)

See merge request !2909
2016-02-22 11:25:20 +01:00
Rémy Coutable b87cadc3c4 Version 8.5.0-rc4 v8.5.0-rc4 2016-02-22 09:54:54 +01:00
Douglas Barbosa AlexandreandRémy Coutable 41f1b3dede Merge branch 'tasks' into 'master'
Add Todos

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425

Tasks:

-  Prepare database
 - [X] Create a new table (`todos`)
- Tasks Queue view
 - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page
 - [X] Add a chronological list of todos, with the 'Todos' tab active by default
 - [X] Add a 'Done' button to each todo
 - [x] Add filters (project, author, type, and action)
- Todos generation
 - [X] When user issue/mr is assgined to someone
 - [x] When user is mentioned on (issues/mr's/comments)
- Mark todo as `done`
 - [X] When clicks on the 'Done' button
 - [X] When edit issue/mr
 - [X] When left/edit a comment
 - [X] When reassign issue/mr
 - [X] When add/remove labels to issue/mr
 - [X] When issue/mr is closed
 - [X] When mr is merged
 - [X] When added an emoji
 - [X] When changed the issue/mr milestone

* Screenshot:

![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png)

See merge request !2817
2016-02-22 08:47:44 +01:00
Douwe MaanandRémy Coutable b947661ce6 Merge branch 'merge-when-succeeded' into 'master'
Fix bugs in MergeWhenSucceeded

1. This fixes support for merge when succeeded for statuses without ref.
2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269

/cc @grzesiek @DouweM @rspeicher 


See merge request !2894
2016-02-22 08:47:20 +01:00
Achilleas PipinellisandRémy Coutable 0e41e6571c Merge branch 'doc_artifacts_api' into 'master'
Fix docs on artifacts API

Small fixes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2893

- Backticks in parameters
- Remove headings
- Fix curl URL link



See merge request !2902
2016-02-21 21:10:23 +01:00
Jacob SchatzandRémy Coutable f79bb559e2 Merge branch 'award-emoji-retina' into 'master'
Award emoji supports retina displays

Based on discussion in !2800

There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is.

Before:

![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png)

After:

![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png)

Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348

cc\ @rspeicher @vsizov 

See merge request !2891
2016-02-21 21:06:58 +01:00
Douwe MaanandRémy Coutable 20b3be6e24 Merge branch 'flush-cache-web-editor' into 'master'
Flush emptiness caches whenever needed



See merge request !2903
2016-02-21 21:06:44 +01:00
Douwe MaanandRémy Coutable 3d83a06356 Merge branch 'visibletrap/gitlab-ce-label' 2016-02-21 21:04:31 +01:00
Douwe MaanandRémy Coutable 5c120204ad Merge branch '12792-emoji-as-text-diff-comment' 2016-02-21 21:02:59 +01:00
Kamil TrzcińskiandRémy Coutable ba893daf53 Merge branch 'builds-artifacts-API' into 'master'
Introduce API for serving the artifacts archive

Add API to download build artifacts archive in context of GitLab API

/cc @DouweM @grzesiek 

See merge request !2893
2016-02-21 20:59:39 +01:00
Achilleas PipinellisandRémy Coutable 6e5084b583 Merge branch 'doc/add-build-email-service' into 'master'
Add documentation about build emails service

Closes #12497

See merge request !2871
2016-02-19 22:39:45 +01:00
Rémy Coutable dc3aa41b9a Version 8.5.0-rc3 v8.5.0-rc3 2016-02-19 22:15:27 +01:00
Jacob SchatzandRémy Coutable 610a4f918c Merge branch 'issue_3276' into 'master'
Labels should be visible in milestone view

Closes #3276 

See merge request !2599
2016-02-19 20:56:00 +01:00
Kamil TrzcińskiandRémy Coutable 3d9943394e Merge branch 'commit-status-fix' into 'master'
Fix missing ignored? for GenericCommitStatus

This is pretty important fix. We should not release 8.5 without this.

It critical error when handling GenericCommitStatus:
```
undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0>
```

cc @grzesiek 


See merge request !2899
2016-02-19 20:29:53 +01:00
Robert SpeicherandRémy Coutable cc314eec83 Merge branch 'gitlab-ce-fix/revert-ruby-2.2' into 'master'
revert back to ruby 2.1

- - -

Revert Ruby 2.2 changes - until we solve https://gitlab.com/gitlab-org/gitlab-ce/issues/13514

This also updates Ruby 2.1.7 to 2.1.8

See merge request !2898
2016-02-19 20:01:54 +01:00
Robert SpeicherandRémy Coutable 0daef5bfd7 Merge branch 'issue_3409' into 'master'
Add ability to revert changes introduced by Merge Requests or Commits

Closes #3409 

See merge request !1990
2016-02-19 19:55:19 +01:00
Rémy Coutable 441896589e Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master'
Consistency in MR and issue header.

Fixes: #13550 

![Screen_Shot_2016-02-18_at_11.20.19_AM](/uploads/8327ff045e45029b85b2cbac72c98a7f/Screen_Shot_2016-02-18_at_11.20.19_AM.png)![Screen_Shot_2016-02-18_at_11.20.55_AM](/uploads/f79613ebb23e4a62fb1bdb48d6f7fd2b/Screen_Shot_2016-02-18_at_11.20.55_AM.png)

See merge request !2874
2016-02-19 19:32:55 +01:00
Grzegorz BizonandRémy Coutable 62067b74c8 Merge branch 'ci/remove-builds' into 'master'
Make it possible to erase build content (artifacts, trace)

This feature makes it possible to remove build content - build artifacts and build traces.

- [x] Remove artifacts
- [x] Remove metadata
- [x] Remove build traces
- [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged
- [x] Fix the permissions after the merge

Closes #3421

See merge request !2560
2016-02-19 18:22:49 +01:00
Rémy Coutable 64f1bab66e Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master'
Mention project name in fork notice

_Originally opened at !1186 by @axil._

- - -

I missed this one in !1070

See merge request !2897
2016-02-19 17:41:06 +01:00
Patricio CanoandRémy Coutable c1921fb510 Merge branch 'saml-decoupling' into 'master' 2016-02-19 16:45:18 +01:00
Kamil TrzcińskiandRémy Coutable 778da50251 Merge branch 'ci/api-runners' into 'master'
Add runners API

References #4264

See merge request !2640
2016-02-19 16:32:43 +01:00
Jacob SchatzandRémy Coutable 7238e7d17e Merge branch 'issue_11872' into 'master'
Put project visibility icon next to title

Fixes #11872

See merge request !2885
2016-02-19 16:32:24 +01:00
Achilleas PipinellisandRémy Coutable ff0ed5f075 Merge branch 'web_editor' into 'master'
Update web editor documentation

Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045

Closes #4262

See merge request !2776
2016-02-19 16:31:24 +01:00
Douwe MaanandRémy Coutable 105f12c33a Merge branch '12791-hide-project-limit-reached-warning' into 'master'
Project limit is reached warning is hidden when the projects_limit is zero

Fixes #12791

See merge request !2890
2016-02-19 16:30:34 +01:00
Douwe MaanandRémy Coutable da0953e652 Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness 

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
2016-02-19 16:29:55 +01:00
Douwe MaanandRémy Coutable f30004819a Merge branch 'fix/project-forks-page' into 'master'
workaround for forks with an invalid repo

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13465

The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. 

With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem...

Also fixing Sentry issue: 1180
`undefined method 'already_forked?' for nil:NilClass `


See merge request !2836
2016-02-19 16:29:41 +01:00
Douwe MaanandRémy Coutable 554d9bf606 Merge branch 'rs-show-owner-label' into 'master'
Allow `ProjectTeam#human_max_access` to return "Owner"



See merge request !2881
2016-02-19 16:29:31 +01:00
Douwe MaanandRémy Coutable 6eacfa9986 Merge branch 'rs-sentry-release-tracking' into 'master'
Add release tracking for Sentry



See merge request !2863
2016-02-19 16:26:06 +01:00
Robert SpeicherandRémy Coutable 10354f7a58 Merge branch 'cache-clear' into 'master'
Use SCAN during 'rake cache:clear'

This allows 'rake cache:clear' to delete millions of keys without
choking. It requires Redis 2.8.0 or newer but we needed that already
anyway.

See merge request !2872
2016-02-19 16:25:23 +01:00
Robert SpeicherandRémy Coutable d3e79985b4 Merge branch 'autocrlf-lazy' into 'master'
Only set autocrlf when creating/updating files

Related issue: gitlab-org/gitlab-ce#13457
Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495

See merge request !2859
2016-02-19 16:25:09 +01:00
Dmitriy ZaporozhetsandRémy Coutable 7655891972 Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master'
Uses cross browser niceScroll to do scrolling on sidebar.

Fixes: #13544 

Firefox does not support `-webkit-scrollbar` and there is no alternative for FF. So for example Gmail falls back to no fancy scrollbar. Stuck with jQuery, which is a good solution, since we already use it. 

This also leaves the default scrollbar as is. 

![Screen_Shot_2016-02-18_at_11.02.26_AM](/uploads/1184f06b71a8d9097ef1e3450a0c0ab3/Screen_Shot_2016-02-18_at_11.02.26_AM.png)

Also fixes horz scroll issue: 

![Screen_Shot_2016-02-18_at_11.09.56_AM](/uploads/63e9a8e824cac69a2745dd4dd84d1dfb/Screen_Shot_2016-02-18_at_11.09.56_AM.png)

cc @creamzy @dzaporozhets 

See merge request !2873
2016-02-18 17:57:06 +01:00
Douwe MaanandRémy Coutable df20569727 Merge branch 'fix/gitpushservice-complexity-issue' into 'master'
Reduce code complexity on GitPushService#execute

Code complexity for gitlab-ce after this has been refactored:
```
  27.3: GitPushService#execute
```
This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that?

I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13327


See merge request !2784
2016-02-18 17:11:47 +01:00
Kamil TrzcińskiandRémy Coutable bdbe892ea2 Merge branch 'fix/ci-first-job-allow-failure' into 'master'
Fix CI builds scheduler when first build in stage is allowed to fail

This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail.

Closes #3192

See merge request !2869
2016-02-18 16:18:45 +01:00
Kamil TrzcińskiandRémy Coutable fcedf80f46 Merge branch 'rs-git-fetch-labels' into 'master'
Fix labels for git clone/git fetch Project CI setting



See merge request !2842
2016-02-18 15:14:34 +01:00
Kamil TrzcińskiandRémy Coutable f762b63214 Merge branch 'patch-1' into 'master'
Add example of creating build artifacts only for release tags.



See merge request !2649
2016-02-18 15:14:23 +01:00
Robert SpeicherandRémy Coutable 03a156224b Merge branch 'issue_13539' into 'master'
Reopened MRs should also be considered as open.

Fixes #13539 

See merge request !2866
2016-02-18 13:00:45 +01:00
Rémy Coutable d19fa9afdb Merge branch 're-add-missing-part-in-update-doc' into 'master'
Re-add section about NGINX config and init script updates in 8.4->8.5 update doc

These sections were removed by !2766 but:
- even if the NGINX config wasn't modified, it might
  be in future updates so it's better to always have
  it instead of having to remember to add it depending
  on the changes
- the init script update section must be there since
  it's a safe command line that should be run on every update

This fixes https://github.com/gitlabhq/gitlabhq/issues/10031.

/cc @rspeicher @yorickpeterse 

See merge request !2815
2016-02-18 13:00:23 +01:00
Achilleas PipinellisandRémy Coutable cdc928d47f Merge branch 'sqlite_rm_rf' into 'master'
Remove remaining sqlite method call

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13535

See merge request !2862
2016-02-18 13:00:04 +01:00
Douwe MaanandRémy Coutable 7dddd45ebf Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master'
Add ability to see and sort on vote count from Issues and MR lists

Fixes #3763

* Sort options

![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png)

* Most popular

![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png)

* Least popular

![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png)

See merge request !2781
2016-02-18 12:58:31 +01:00
Rémy Coutable 2e3c35711c Version 8.5.0-rc2 v8.5.0-rc2 2016-02-17 18:23:59 +01:00
Rémy Coutable 64f4784584 Merge remote-tracking branch 'origin/master' into 8-5-stable 2016-02-17 17:59:17 +01:00
Rémy Coutable a4ffdf922d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-02-17 17:33:09 +01:00