summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use Projects::CreateService to fork projects so that after-create hooks are run.forked-eventDouwe Maan2015-04-246-69/+42
|
* Merge branch 'add_count_to_state_filters' into 'master'Marin Jankovski2015-04-242-3/+17
|\ | | | | | | | | | | | | | | | | | | Add issue and merge request count for state filters. Related to issue #2170 Changes relate to project issues and merge request pages, dashboard and group pages remain the same. See merge request !1747
| * Check if project before calling count on issuable.Marin Jankovski2015-04-241-1/+3
| |
| * Add issue and merge request count for state filters.Marin Jankovski2015-04-242-3/+15
| |
* | Merge branch 'canonical-source' into 'master'Dmitriy Zaporozhets2015-04-241-4/+4
|\ \ | | | | | | | | | | | | | | | Make source code on GitLab more prominent. See merge request !1741
| * | Make source code on GitLab more prominent.Sytse Sijbrandij2015-03-251-4/+4
| | |
* | | Merge branch 'commit-project' into 'master'Douwe Maan2015-04-2454-205/+218
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link cross-project cross-reference notes to correct project. - Fixes #1431: Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits. - Include commit comments in MR from a forked project. To accomplish this, the Commit model needs to know about its project. Adding this attribute also simplifies a bunch of other methods that deal with a note's target, that previously had to have special logic for when it belonged to a commit. See merge request !554
| * | | Fix tests.commit-projectDouwe Maan2015-04-241-3/+3
| | | |
| * | | Explain purpose and usage.Douwe Maan2015-04-241-0/+24
| | | |
| * | | Fix behavior for Enumerable-like ActiveRecord relations.Douwe Maan2015-04-241-3/+1
| | | |
| * | | Fix small issues.Douwe Maan2015-04-242-6/+7
| | | |
| * | | Satisfy Rubocop.Douwe Maan2015-04-241-11/+12
| | | |
| * | | Fix errors.Douwe Maan2015-04-242-3/+2
| | | |
| * | | Update changelog.Douwe Maan2015-04-241-0/+2
| | | |
| * | | Select MR commit notes from source project.Douwe Maan2015-04-241-3/+6
| | | |
| * | | Move participants method to shared Participable concern.Douwe Maan2015-04-245-43/+51
| | | |
| * | | Link cross-project cross-reference notes to correct project.Douwe Maan2015-04-249-61/+36
| | | |
| * | | No longer needed to pass project argument to commit methods.Douwe Maan2015-04-2410-31/+26
| | | |
| * | | Use project.commit convenience method.Douwe Maan2015-04-2430-44/+44
| | | |
| * | | Let commit model know about its project.Douwe Maan2015-04-2412-27/+34
| | |/ | |/|
* | | Merge pull request #9065 from rumpelsepp/issuesDmitriy Zaporozhets2015-04-245-47/+40
|\ \ \ | |/ / |/| | Tweak issue page a bit
| * | Try to fix tests for pull request #9065Stefan Tatschner2015-04-241-1/+1
| | | | | | | | | | | | | | | This crappy test framework stuff fails randomly. So I can't reliably run it on my local machine.
| * | Tweak merge requestsStefan Tatschner2015-04-242-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | * Include creation time * Include author without avatar * Move assignee to the right * Include comments counter by default, gray it out when there are 0 comments.
| * | Tweak issue pageStefan Tatschner2015-04-242-31/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Include creation time * Include author without avatar * Move assignee to the right * Remove action buttons. IMO they are useless and a bit annoying * Include comments counter by default, gray it out when there are 0 comments.
* | | Merge branch 'atom-feeds-everywhere' into 'master'Dmitriy Zaporozhets2015-04-2424-57/+133
|\ \ \ | | | | | | | | | | | | | | | | | | | | Add project activity atom feed and show atom feed buttons everywhere where applicable. See merge request !555
| * | | Remove unnecessary private_token params.atom-feeds-everywhereDouwe Maan2015-04-237-7/+7
| | | |
| * | | Fix spec.Douwe Maan2015-04-231-1/+1
| | | |
| * | | Rename "News Feed" buttons to "Activity Feed"Douwe Maan2015-04-233-3/+3
| | | |
| * | | Fix project atom link tag.Douwe Maan2015-04-231-1/+1
| | | |
| * | | Update changelog.Douwe Maan2015-04-231-0/+2
| | | |
| * | | Make links and titles of atom feeds consistent.Douwe Maan2015-04-2311-31/+31
| | | |
| * | | Add atom feed for project activity.Douwe Maan2015-04-234-8/+40
| | | |
| * | | Move activity feed buttons out of event_filter into actual show views.Douwe Maan2015-04-234-14/+20
| | | |
| * | | Add feed button to dashboard and group issue pages.Douwe Maan2015-04-232-0/+12
| | | |
| * | | Add atom link tag to every page that has one.Douwe Maan2015-04-239-10/+34
| | | |
* | | | Merge branch 'rs-sam-to-dmitriy' into 'master'Dmitriy Zaporozhets2015-04-242-24/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "Sam" to "Dmitriy" in feature steps "Sam" was too short and generic and caused invalid test failures due to finding other people with names like "Sammie" or "Samuel" unexpectedly. See https://ci.gitlab.com/projects/1/builds/35205 and https://ci.gitlab.com/projects/1/builds/35093 as two recent examples. See merge request !571
| * | | | Change "Sam" to "Dmitriy" in feature stepsrs-sam-to-dmitriyRobert Speicher2015-04-232-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | "Sam" was too short and generic and caused invalid test failures due to finding other people with names like "Sammie" or "Samuel" unexpectedly.
* | | | | Fix align of issue status box with close/edit buttons to the rightDmitriy Zaporozhets2015-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-243-29/+30
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'rs-update-d3-atwho' into 'master'Robert Speicher2015-04-233-29/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update d3_rails and jquery-atwho-rails We were a bit behind on these JS libs, so this updates them. AtWho made a few API changes for which I had to update our usage. Should fix #1457 as well. See merge request !542
| | * | | | Fix GfmAutoComplete for jquery-atwho 1.0rs-update-d3-atwhoRobert Speicher2015-04-231-23/+24
| | | | | |
| | * | | | Update jquery-atwho-railsRobert Speicher2015-04-232-3/+3
| | | | | |
| | * | | | Update d3_railsRobert Speicher2015-04-232-3/+3
| | | | | |
* | | | | | Merge branch 'rs-mentionable-examples-refactor' into 'master'Dmitriy Zaporozhets2015-04-237-54/+85
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mentionable shared examples to be (a bit) more understandable These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now. I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it. See merge request !1780
| * | | | | Minor mentionable shared example changeRobert Speicher2015-04-161-2/+2
| | | | | |
| * | | | | Update mentionable shared examples to be (a bit) more understandableRobert Speicher2015-04-162-43/+70
| | | | | |
| * | | | | Correct usage of `subject` in specsRobert Speicher2015-04-166-7/+11
| | | | | |
| * | | | | Note#cross_reference_exists? should be checking the noteable_type alsoRobert Speicher2015-04-161-2/+2
| | | | | |
* | | | | | Merge branch 'rs-issue-2266' into 'master'Dmitriy Zaporozhets2015-04-233-4/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add default_url_options initializer Fixes #2266 See merge request !1791
| * | | | | | Provide autoload paths for filters to prevent circular dependencyRobert Speicher2015-04-232-4/+15
| | | | | | |
View Lorry Controller Status