summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Simplify the `skip_before_filter` logic for UploadsControllerrs-simplify-uploads-controllerRobert Speicher2015-04-231-5/+2
|
* 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
| | | |
| | * | Redirect to sign in page after signing out.Douwe Maan2015-04-182-0/+5
| | | |
| * | | Merge branch 'rs-rails-env-predicates' into 'master'Dmitriy Zaporozhets2015-04-232-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix two places where we should be using `Rails.env.development?` See merge request !550
| | * | | Fix two places where we should be using `Rails.env.development?`rs-rails-env-predicatesRobert Speicher2015-04-202-2/+2
| | | | |
* | | | | Merge pull request #9062 from fgimian/omniauth-disable-turbolinkDmitriy Zaporozhets2015-04-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Disable turbolinks for omniauth link to avoid rendering problems
| * | | | 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-233-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254. See merge request !553
| * | | | | Fix bug causing `@whatever` inside code blocks to sometimes be picked up as ↵issue-body-code-mentionsDouwe Maan2015-04-213-4/+5
| | |/ / / | |/| | | | | | | | | | | | | a user mention.
* | | | | Merge branch 'rs-search_text_nodes' into 'master'Dmitriy Zaporozhets2015-04-232-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `search_text_nodes` helper in our custom filters Closes #1477 See merge request !561
| * | | | | Use `search_text_nodes` helper in our custom filtersrs-search_text_nodesRobert Speicher2015-04-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes #1477
* | | | | | Merge branch 'new-sidebar' into 'master'Dmitriy Zaporozhets2015-04-2333-248/+290
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New sidebar design I want to make separation between sidebar and content - [x] change sidebar and header colors - [x] change colors for old light theme so it matches dark style too - [x] rename theme names to something more reasonable - [x] fix header logo collapse with JS - [x] fix navless layouts (explore page, login page, snippets, user page) - [x] fix tests See merge request !558
| * \ \ \ \ \ Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-23135-1462/+3533
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/snippets_controller.rb
* | | | | | | Merge pull request #8996 from vinkla/patch-1Marin Jankovski2015-04-231-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix Node.js Error in Documentation
| * | | | | | | Fix nodejs installation guide in documentation.Vincent Klaiber2015-04-231-0/+2
| | | | | | | |
* | | | | | | | Move the upgrade document to the correct location.Marin Jankovski2015-04-231-0/+0
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-221-5/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'upgrader-for-7.10' into 'master'Job van der Voort2015-04-221-5/+5
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update command in upgrader docs to work with 7.10.0. See merge request !562
| | * | | | | | | Update command in upgrader docs to work with 7.10.0.Douwe Maan2015-04-221-5/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-223-74/+74
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #9078 from ikappas/project-services-extend-uiDmitriy Zaporozhets2015-04-223-74/+74
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Add Fieldset Support to Project Services Views
| | * | | | | | | added fieldset support to project and admin services views.Ioannis Kappas2015-04-223-74/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | split field logic to separate template.
* | | | | | | | | Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-2218-100/+624
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Reply quoting selected text" shortcut/hotkey Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms. This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs. See merge request !1775
| * | | | | | | | Add changelog entry [ci skip]Robert Speicher2015-04-181-1/+1
| | | | | | | | |
| * | | | | | | | Typo: Issueable -> IssuableRobert Speicher2015-04-184-7/+7
| | | | | | | | |
| * | | | | | | | Add JS specs for replyWithSelectedTextRobert Speicher2015-04-183-0/+519
| | | | | | | | |
| * | | | | | | | 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
| | | | | | | | |
| * | | | | | | | Simplify jasmine.yml since we're using jasmine-rails gemRobert Speicher2015-04-181-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of these values are handled by the asset pipeline.
| * | | | | | | | Make StatGraph JS explicitly require its dependenciesRobert Speicher2015-04-185-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to test them in a bit more isolation.
| * | | | | | | | rails g jasmine_rails:installRobert Speicher2015-04-182-115/+42
| | | | | | | | |
| * | | | | | | | Add jasmine-rails gemRobert Speicher2015-04-182-0/+7
| | | | | | | | |
| * | | | | | | | Re-run rails g jasmine:installRobert Speicher2015-04-182-4/+56
| | | | | | | | |
| * | | | | | | | Update jasmine gemRobert Speicher2015-04-182-7/+7
| | | | | | | | |
| * | | | | | | | Fix 'merge_reuests' typoRobert Speicher2015-04-182-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'update_slack_doc' into 'master'Job van der Voort2015-04-221-3/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Slack documentation Fixes #2234 Updated the Slack documentation to include the new fields located in the service's settings. /cc @karen See merge request !1788
| * | | | | | | | Updated the Slack documentationPatricio Cano2015-04-211-3/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'rs-issue-2257' into 'master'Dmitriy Zaporozhets2015-04-222-4/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recover from URI::Error `URI::Error` is the base class for all URI errors. Fixes #2257 and #2260 See merge request !1789
| * | | | | | | | | Recover from all `URI::Error`sRobert Speicher2015-04-212-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2257 Fixes #2260
* | | | | | | | | | Merge branch 'missing-upgrade-doc' into 'master'Marin Jankovski2015-04-221-0/+118
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add 7.9-7.10 upgrade doc See merge request !560
| * | | | | | | | | | add 7.9-7.10 upgrade docJob van der Voort2015-04-221-0/+118
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-222-4/+4
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'update_grack' into 'master'Dmitriy Zaporozhets2015-04-222-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-grack to 2.0.2. Updating to grack version 2.0.2 to fix an issue with smart http clients. See merge request !559
View Lorry Controller Status