summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary private_token params.atom-feeds-everywhereDouwe Maan2015-04-237-7/+7
* Rename "News Feed" buttons to "Activity Feed"Douwe Maan2015-04-233-3/+3
* Fix project atom link tag.Douwe Maan2015-04-231-1/+1
* Make links and titles of atom feeds consistent.Douwe Maan2015-04-2311-31/+31
* Add atom feed for project activity.Douwe Maan2015-04-233-5/+37
* 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
* Fix sidebar collapse buttonDmitriy Zaporozhets2015-04-231-3/+3
* Add CHANGELOG item for new sidebarDmitriy Zaporozhets2015-04-231-1/+4
* Merge pull request #9042 from skburgart/fix/jira-linkMarin Jankovski2015-04-231-6/+5
|\
| * Fix broken link in jira serviceSteven Burgart2015-03-271-6/+5
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-04-232-1/+5
|\ \
| * \ Merge branch 'sign-out-to-sign-in' into 'master'Dmitriy Zaporozhets2015-04-231-0/+4
| |\ \
| | * | Redirect to sign in page after signing out.Douwe Maan2015-04-181-0/+4
| * | | Merge branch 'rs-rails-env-predicates' into 'master'Dmitriy Zaporozhets2015-04-231-1/+1
| |\ \ \
| | * | | Fix two places where we should be using `Rails.env.development?`rs-rails-env-predicatesRobert Speicher2015-04-201-1/+1
* | | | | Merge pull request #9062 from fgimian/omniauth-disable-turbolinkDmitriy Zaporozhets2015-04-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Disable turbolinks for omniauth link to avoid rendering problemsFotis Gimian2015-03-311-1/+1
* | | | | Merge branch 'issue-body-code-mentions' into 'master'Dmitriy Zaporozhets2015-04-231-1/+1
|\ \ \ \ \
| * | | | | Fix bug causing `@whatever` inside code blocks to sometimes be picked up as a...issue-body-code-mentionsDouwe Maan2015-04-211-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-2384-310/+402
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-223-74/+74
| |\ \ \ \ \
| | * | | | | added fieldset support to project and admin services views.Ioannis Kappas2015-04-223-74/+74
| * | | | | | Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-227-23/+68
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Typo: Issueable -> IssuableRobert Speicher2015-04-183-4/+4
| | * | | | | Add JS specs for replyWithSelectedTextRobert Speicher2015-04-181-0/+3
| | * | | | | Add hotkey for "reply with selected text" to IssueableRobert Speicher2015-04-181-1/+27
| | * | | | | Add 'reply' hotkey to help modalRobert Speicher2015-04-181-0/+8
| | * | | | | Make StatGraph JS explicitly require its dependenciesRobert Speicher2015-04-182-0/+8
| | * | | | | Fix 'merge_reuests' typoRobert Speicher2015-04-182-2/+2
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'rs-issue-2257' into 'master'Dmitriy Zaporozhets2015-04-221-4/+8
| |\ \ \ \ \
| | * | | | | Recover from all `URI::Error`sRobert Speicher2015-04-211-4/+8
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-04-221-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix tab behavior on MergeRequests#newrs-toggle-tabRobert Speicher2015-04-211-2/+2
| | |/ / / / /
| * | | | | | Merge pull request #9164 from dsander/fix-markdown-previewJeroen van Baarsen2015-04-221-1/+1
| |\ \ \ \ \ \
| | * | | | | | Make issue preview look like the resultDominik Sander2015-04-211-1/+1
| * | | | | | | do not send empty message to hipchatChulki Lee2015-04-221-2/+3
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'rs-reference-filters' into 'master'Dmitriy Zaporozhets2015-04-214-6/+19
| |\ \ \ \ \ \
| | * | | | | | Escape title attributes in referencesRobert Speicher2015-04-202-2/+6
| | * | | | | | Begin cleaning out spec/helpers/gitlab_markdown_helper_specRobert Speicher2015-04-201-0/+1
| | * | | | | | Remove duplicate ampersand from Label title format validatorRobert Speicher2015-04-201-1/+1
| | * | | | | | Reference filters :sparkles:Robert Speicher2015-04-202-5/+13
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-214-4/+29
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge branch 'google-code-fixes' into 'master'Dmitriy Zaporozhets2015-04-212-4/+26
| | |\ \ \ \ \
| | | * | | | | Improve description of Google Code import user map.Douwe Maan2015-04-211-3/+25
| | | * | | | | Fix redirect when trying to view invalid Google Code import status.Douwe Maan2015-04-211-1/+1
| | | |/ / / /
| | * | | | | Merge branch 'fix-cannot-move-project-error' into 'master'Douwe Maan2015-04-212-0/+3
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix "Cannot move project" error message from popping up after a successful pr...Stan Hu2015-04-202-0/+3
| | | |/ / /
| * | | | | Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-2064-195/+195
| |/ / / /