home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Douwe Maan 059cc16430 Fix project atom link tag. 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 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
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 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
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
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
Marin Jankovski 8d9c7305cd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-22 11:17:09 +02:00
Jeroen van Baarsen 5e9d4a08a5 Merge pull request #9164 from dsander/fix-markdown-preview 
Make issue preview look like the result
 2015-04-22 08:37:27 +02:00
Robert Speicher c917b26f41 Recover from all URI::Errors 
Fixes #2257
Fixes #2260
 2015-04-21 22:02:44 -04:00
Chulki Lee 681fb7def6 do not send empty message to hipchat 2015-04-22 08:05:19 +09:00
Dominik Sander 34b976fd27 Make issue preview look like the result 2015-04-21 22:16:53 +02:00
Robert Speicher 3ceb888d79 Fix tab behavior on MergeRequests#new 2015-04-21 15:19:06 -04:00
Dmitriy Zaporozhets 2cd501f7e4 Merge branch 'rs-reference-filters' into 'master' 
Convert GFM reference handling to html-pipeline filters

- `Gitlab::Markdown` is now much cleaner
- Better separation of concerns
- Cleaner, less brittle, more maintainable specs for each reference type.
- Label references actually work!

See merge request !1753
 2015-04-21 16:43:54 +00:00
Dmitriy Zaporozhets 1e7c4a25fd Small css cleanup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-21 16:49:25 +03:00
Dmitriy Zaporozhets 9f032b9c2a Move header css from pages to generic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-21 16:35:45 +03:00
Dmitriy Zaporozhets 6e6df3b830 Refactor themes for new UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-21 16:35:11 +03:00
Douwe Maan 51ad59e0d8 Fix bug causing @whatever inside code blocks to sometimes be picked up as a user mention. 2015-04-21 14:58:18 +02:00
Dmitriy Zaporozhets 2505300b7b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/import/google_code_controller.rb
 2015-04-21 15:36:58 +03:00
Dmitriy Zaporozhets 86dfdc36bd Merge branch 'google-code-fixes' into 'master' 
Fix some issues with Google Code importer

Thanks, @mrtux, for reporting all of these.

See merge request !551
 2015-04-21 12:32:00 +00:00
Dmitriy Zaporozhets d3059c7d29 New colorful design of sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-21 15:31:32 +03:00
Douwe Maan 2400181a3a Merge branch 'fix-cannot-move-project-error' into 'master' 
Fix "Cannot move project" error message from popping up after a successful transfer

The JavaScript click handlers were never being removed, leading to duplicate requests when attempting to transfer a project to another namespace. The first transfer would succeed but the subsequent ones would fail, leading to the error message saying, "Cannot move project".

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/0c9f61294291514e0c2a48c204b6a1aa/image.png)

I attempted to write a unit test for this, but it was taking me too long to get it right.

Closes #1448 and #1128

See merge request !548
 2015-04-21 09:29:17 +00:00
Douwe Maan 1419e94816 Improve description of Google Code import user map. 2015-04-21 10:33:04 +02:00
Douwe Maan 355e6868a2 Fix redirect when trying to view invalid Google Code import status. 2015-04-21 10:30:07 +02:00
Robert Speicher 6c3591279f Fix two places where we should be using Rails.env.development? 2015-04-20 18:28:19 -04:00
Stan Hu 6fb1e80a26 Fix "Cannot move project" error message from popping up after a successful project transfer 
Multiple event handlers were firing, causing multiple form submissions.

Closes #1448 and #1128
 2015-04-20 12:46:02 -07:00
Robert Speicher b905702d4f Escape title attributes in references 2015-04-20 13:01:46 -04:00
Robert Speicher f76df89058 Begin cleaning out spec/helpers/gitlab_markdown_helper_spec 2015-04-20 13:01:44 -04:00
Robert Speicher c1c1ef52c3 Remove duplicate ampersand from Label title format validator 2015-04-20 13:01:43 -04:00