summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
| | | | |
| * | | | Add default_url_options initializerRobert Speicher2015-04-231-0/+13
| | |/ / | |/| | | | | | | | | | Fixes #2266
* | | | Merge branch 'rs-fixed-width-nav' into 'master'Dmitriy Zaporozhets2015-04-238-56/+55
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use fixed width icons in all nav sidebars | Before (watch the Network and Graphs icons as the sidebar collapses): | After: | | :--------: | :------: | |![Screen_Recording_2015-04-23_at_02.31_PM.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/338aa382ff7609978cd900db29379f3f/Screen_Recording_2015-04-23_at_02.31_PM.mov.gif)|![Screen_Recording_2015-04-23_at_02.30_PM.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/24af635f253688690b42da60271e7afb/Screen_Recording_2015-04-23_at_02.30_PM.mov.gif)| Uses the `icon` helper, because I can't help myself! See merge request !566
| * | | Use fixed width icons in all nav sidebarsRobert Speicher2015-04-238-56/+55
|/ / /
* | | Improve navbar toggle for mobile devicesDmitriy Zaporozhets2015-04-232-13/+3
| |/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix sidebar collapse buttonDmitriy Zaporozhets2015-04-231-3/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add CHANGELOG item for new sidebarDmitriy Zaporozhets2015-04-232-3/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #9042 from skburgart/fix/jira-linkMarin Jankovski2015-04-231-6/+5
|\ \ | | | | | | Fix broken link in jira service
| * | Fix broken link in jira serviceSteven Burgart2015-03-271-6/+5
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-04-234-2/+7
|\ \ \
| * \ \ Merge branch 'sign-out-to-sign-in' into 'master'Dmitriy Zaporozhets2015-04-232-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to sign in page after signing out. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2125. See merge request !541
| | * | | Move changelog item to 7.11.sign-out-to-sign-inDouwe Maan2015-04-181-1/+1
| | | | |