home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Tatschner dbd0fd20a9 Tweak issue page 
* 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.
 2015-04-24 09:36:42 +02:00
Karen Carias a62060b1de Added " How to maintain tight control over the number of active users on your GitLab installation" to documentation 2015-04-24 02:19:21 +00:00
Robert Speicher 9b330859bf 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.
 2015-04-23 18:59:57 -04:00
Robert Speicher 3ae31c2282 Merge branch 'rs-update-d3-atwho' into 'master' 
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
 2015-04-23 22:55:07 +00: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
Robert Speicher 10053b173d Simplify the skip_before_filter logic for UploadsController 2015-04-23 13:15:47 -04:00
Robert Speicher 85bbb91476 Fix GfmAutoComplete for jquery-atwho 1.0 2015-04-23 13:08:16 -04:00
Robert Speicher d086e76c2f Update jquery-atwho-rails 2015-04-23 13:08:16 -04:00
Robert Speicher af855b573f Update d3_rails 2015-04-23 13:07:44 -04: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
Douwe Maan a12d50c5e5 Remove unnecessary private_token params. 2015-04-23 17:11:39 +02:00
Douwe Maan a8812dc148 Fix spec. 2015-04-23 17:11:39 +02:00
Douwe Maan cd450221eb Rename "News Feed" buttons to "Activity Feed" 2015-04-23 17:11:39 +02:00
Douwe Maan 059cc16430 Fix project atom link tag. 2015-04-23 17:11:39 +02:00
Douwe Maan 713413a86c Update changelog. 2015-04-23 17:11:39 +02:00
Douwe Maan 9c60354a6a Make links and titles of atom feeds consistent. 2015-04-23 17:11:39 +02:00
Douwe Maan a6dfd065ca Add atom feed for project activity. 2015-04-23 17:11:39 +02:00
Douwe Maan 72b090b890 Move activity feed buttons out of event_filter into actual show views. 2015-04-23 17:11:38 +02:00
Douwe Maan cba86eed74 Add feed button to dashboard and group issue pages. 2015-04-23 17:11:38 +02:00
Douwe Maan 8917ae39e3 Add atom link tag to every page that has one. 2015-04-23 17:11:38 +02: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
Stan Hu 9a2e3d3d81 Fix broken file browsing with relative submodule in personal projects 
Closes https://github.com/gitlabhq/gitlabhq/issues/7554
 2015-04-23 07:42:28 -07: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
Aurelio Jargas fab876b9f9 Remove duplicate CHANGELOG line for v7.10.0 
The other one is 3 lines below the removed.
 2015-04-22 18:44:30 -03: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