home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,228 Commits 48 Branches 340 Tags
97cf775753ab319288dc6fca858e80a90ffd1aaa
Commit Graph
17228 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 97cf775753 Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !380
 2015-04-24 10:29:08 +00:00
Dmitriy Zaporozhets 9148819323 Rename before_filter to before_action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-24 12:53:33 +03:00
Dmitriy Zaporozhets 0d2f3318fb Merge branch 'add_comment_when_it_is_new' into 'master' 
Check if comment exists before sending a reference to Jira

Currently every time an issue is mentioned, Jira service sends a reference to Jira.
To prevent problems like described in #265 , add another query to the process to retrieve all comments for the issue so we can see if it contains the reference we want to add.

See merge request !377
 2015-04-24 09:50:04 +00:00
Dmitriy Zaporozhets f502b293e5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Marin Jankovski 8602374432 Update changelog-ee. 2015-04-24 10:16:24 +02:00
Dmitriy Zaporozhets c30079f3f4 Merge branch 'rs-mentionable-examples-refactor' into 'master' 
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
 2015-04-23 20:50:48 +00:00
Dmitriy Zaporozhets 05f0bbff0e Merge branch 'rs-issue-2266' into 'master' 
Add default_url_options initializer

Fixes #2266

See merge request !1791
 2015-04-23 19:18:51 +00:00
Dmitriy Zaporozhets db3bd62c2c Merge branch 'rs-fixed-width-nav' into 'master' 
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
 2015-04-23 19:11:24 +00:00
Robert Speicher 429fe505bd Use fixed width icons in all nav sidebars 2015-04-23 14:29:00 -04:00
Job van der Voort 61c4dcdb0a new packages 2015-04-23 19:30:14 +02:00
Robert Speicher a14d109b9b Provide autoload paths for filters to prevent circular dependency 2015-04-23 12:58:55 -04:00
Robert Speicher b71e5a17e9 Add default_url_options initializer 
Fixes #2266
 2015-04-23 12:58:11 -04:00
Dmitriy Zaporozhets 926a814641 Improve navbar toggle for mobile devices 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-23 18:21:59 +03:00
Dmitriy Zaporozhets 27289599e2 Fix sidebar collapse button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-23 17:55:25 +03:00
Dmitriy Zaporozhets 96e4c780d1 Add CHANGELOG item for new sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-23 17:44:56 +03:00
Marin Jankovski ec350f0bcf Merge pull request #9042 from skburgart/fix/jira-link 
Fix broken link in jira service
 2015-04-23 15:14:48 +02:00
Marin Jankovski cc8de0e5e7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-23 15:14:22 +02:00
Dmitriy Zaporozhets ac4968b97e Merge pull request #9062 from fgimian/omniauth-disable-turbolink 
Disable turbolinks for omniauth link to avoid rendering problems
 2015-04-23 16:11:21 +03:00
Dmitriy Zaporozhets d4fb062d97 Merge branch 'sign-out-to-sign-in' into 'master' 
Redirect to sign in page after signing out.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2125.

See merge request !541
 2015-04-23 12:38:11 +00:00
Dmitriy Zaporozhets f9119150ec Merge branch 'rs-rails-env-predicates' into 'master' 
Fix two places where we should be using `Rails.env.development?`

See merge request !550
 2015-04-23 12:37:46 +00:00
Dmitriy Zaporozhets 285ae60c15 Merge branch 'issue-body-code-mentions' into 'master' 
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
 2015-04-23 12:33:01 +00:00
Dmitriy Zaporozhets 67996c1e03 Merge branch 'rs-search_text_nodes' into 'master' 
Use `search_text_nodes` helper in our custom filters

Closes #1477

See merge request !561
 2015-04-23 12:27:36 +00:00
Dmitriy Zaporozhets 1c96b0b9bf Merge branch 'new-sidebar' into 'master' 
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
 2015-04-23 10:51:02 +00:00
Dmitriy Zaporozhets 71f6143552 Merge branch 'master' into new-sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/snippets_controller.rb
 2015-04-23 12:08:03 +03:00
Dmitriy Zaporozhets 63c5911961 Dont render dashbaord nav if user is not signed in 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-23 11:51:17 +03:00
Marin Jankovski aac2755045 Merge pull request #8996 from vinkla/patch-1 
Fix Node.js Error in Documentation
 2015-04-23 09:08:34 +02:00
Marin Jankovski 8b4d1b78e9 Move the upgrade document to the correct location. 2015-04-23 09:05:30 +02:00
Vincent KlaiberandVincent Klaiber 3a8bcea2e7 Fix nodejs installation guide in documentation. 2015-04-23 08:35:17 +02:00
Sytse Sijbrandij 1b9f7e6573 Make the client side javascript MIT so people can use GitLab.com in freedom. 2015-04-23 05:35:30 +00:00
Dmitriy Zaporozhets e368212226 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-22 23:00:27 +03:00
Dmitriy Zaporozhets 5b6e702e31 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-22 22:59:24 +03:00
Dmitriy Zaporozhets a22f3139f3 Merge branch 'rs-reply-hotkey' into 'master' 
"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
 2015-04-22 19:57:40 +00:00
Dmitriy Zaporozhets b0c1e255ae Merge pull request #9078 from ikappas/project-services-extend-ui 
Add Fieldset Support to Project Services Views
 2015-04-22 22:52:40 +03:00
Job van der Voort b42ee44c50 Merge branch 'upgrader-for-7.10' into 'master' 
Update command in upgrader docs to work with 7.10.0.

See merge request !562
 2015-04-22 19:21:00 +00:00
Douwe Maan 7d49b9656c Update command in upgrader docs to work with 7.10.0. 2015-04-22 21:09:40 +02:00
Robert Speicher fb5116caa2 Use search_text_nodes helper in our custom filters 
Closes #1477
 2015-04-22 13:18:15 -04:00
Dmitriy Zaporozhets 5f3b2be8a0 Fix snippet test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 20:12:52 +03:00
Dmitriy Zaporozhets 28639a1971 For navless pages render dashboard nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 20:10:38 +03:00
Ioannis Kappas 3196c52969 added fieldset support to project and admin services views. 
split field logic to separate template.
 2015-04-22 20:04:03 +03:00
Job van der Voort 48493e6628 Merge branch '710-packages' into 'master' 
Added the 7.10-ee packages.

See merge request !378
 2015-04-22 16:55:33 +00:00
Patricio Cano 952cc25920 Added the 7.10-ee packages. 2015-04-22 10:58:28 -05:00
Dmitriy Zaporozhets 47d26b05a4 Fix snippets tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 18:25:09 +03:00
Dmitriy Zaporozhets 0261a5e222 Fix wording and remove duplicate link 2015-04-22 18:18:11 +03:00
Dmitriy Zaporozhets 4a63573b21 Start applying new layout to snippets pages 2015-04-22 18:17:43 +03:00
Dmitriy Zaporozhets 27919e25e8 Add gitlab logo on login page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 18:02:29 +03:00
Dmitriy Zaporozhets c41a5bf3cd Restyle explore page to sidebar layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 17:28:44 +03:00
Dmitriy Zaporozhets 5647ce75b3 No need in empty head panel on login page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 16:54:39 +03:00
Dmitriy Zaporozhets 4860c4dc07 Fix toggle of sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 16:48:39 +03:00
Job van der Voort b5ee60c512 Merge branch 'update_slack_doc' into 'master' 
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
 2015-04-22 13:48:12 +00:00
Dmitriy Zaporozhets 0e0325ee99 Merge branch 'rs-issue-2257' into 'master' 
Recover from URI::Error

`URI::Error` is the base class for all URI errors.

Fixes #2257 and #2260

See merge request !1789
 2015-04-22 13:04:46 +00:00