Commit Graph
3667 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 45bebd76d6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-21 15:56:29 -08:00
Dmitriy Zaporozhets 6a1aa4763a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-21 15:56:20 -08:00
Marin Jankovski ab2a6111ee Fix the sentence on notification page. 2015-01-21 13:36:27 -08:00
Dmitriy Zaporozhets e5d491b7c7 Merge pull request #7389 from skv-headless/show-submodules-in-diff
show diff in submodules
2015-01-21 11:53:09 -08:00
Dmitriy Zaporozhets 2395b8f079 Merge branch 'show_tags_in_commit_view' into 'master'
Show tags in commit view

### What does this MR do?
With this MR you can see the assigned tags for a commit in the commit view.
### Are there points in the code the reviewer needs to double check?
I don't think so. But it would be awesome if the reviewer can tell me how to add a tag to the sample_commit in spec/support/repo_helpers.rb.
Then I can add a test for the new tag_names_contains method as soon as possible :)

### Why was this MR needed?
At the moment if one click on a commit will see details such as: parent commit, amount of additions, deletions, but will not see if this commit has Tag linked to it.
Showing branch, tag details will give better overview about the commit

### What are the relevant issue numbers / Feature requests?
Feature request: http://feedback.gitlab.com/forums/176466-general/suggestions/3962044-show-tags-in-commit-view
### Screenshots
![gitlab_feature_show_tags](https://gitlab.com/uploads/haynes/gitlab-ce/771c1a36bb/gitlab_feature_show_tags.png)

@dblessing Can you take a look at this MR as well please?

See merge request !297
2015-01-21 18:23:46 +00:00
Valery Sizov 6da0ab7d60 Github Importer: AJAX update status 2015-01-20 11:52:55 -08:00
Dmitriy Zaporozhets e3987bb6b1 Merge pull request #8585 from duduribeiro/fix_email_in_ssh_help_page
Fix the email variable substituation in ssh help page
2015-01-19 15:01:00 -08:00
Valery Sizov 1809b3ee36 Spinach for admin applications 2015-01-19 11:18:00 -08:00
Headless 3d2aaa169e show diff in submodules 2015-01-19 17:18:08 +03:00
Dmitriy Zaporozhets fd41e39906 Votes block has less priority than assignee/milestone 2015-01-18 19:42:09 -08:00
Dmitriy Zaporozhets ab651ef45c Merge branch 'syntax_highlight_diff_email' into 'master'
Add syntax colors to diffs in email-on-push notifications

## What does this MR do?
This MR adds syntaxhighlighting to the email-on-push notifications.
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Currently the diff in email-on-push notifications is just a monochrome diff that's hard to read.
This MR adds colored syntaxhighlighting to the mails.
## What are the relevant issue numbers / Feature requests?
* It closes https://github.com/gitlabhq/gitlabhq/issues/6994
* There is a Discussion in the Feedback Forum: http://feedback.gitlab.com/forums/176466-general/suggestions/5802256-add-color-to-diffs-in-email-on-push-service-to-htm
* A pull request for this already existed, but was closed. https://github.com/gitlabhq/gitlabhq/pull/7739

## Screenshots
see prior Pull Request for a screenshot

See merge request !295
2015-01-18 19:16:32 +00:00
Dmitriy Zaporozhets 0c26f871e3 Merge branch 'fix_sort_dropdown_style' into 'master'
Fix sort dropdown partially not showing on screen.

This MR fixes the sort dropdown menu partially not showing on the screen.
Closes gitlab-org/gitlab-ce#986

Screenshot of the Problem:
![Problem](https://gitlab.com/uploads/gitlab-org/gitlab-ce/8d442e872c/Screenshot_from_2015-01-17_15_18_41.png)

@dzaporozhets Can you take a look at this?

See merge request !299
2015-01-18 18:47:06 +00:00
Dmitriy Zaporozhets 7d5d5e53b1 Merge branch 'doorkeeper_applications_scafold' 2015-01-17 16:17:45 -08:00
Dmitriy Zaporozhets a81081aa72 Small improvements to CI 2015-01-17 16:17:34 -08:00
Valery Sizov 20028523b5 Application admin scaffold 2015-01-17 15:40:09 -08:00
Dmitriy Zaporozhets 045fe8959e Merge branch 'fix-commits-pagination' into 'master'
Fix commits pagination

See merge request !1406
2015-01-17 23:39:34 +00:00
Dmitriy Zaporozhets ef0b15c552 Fix commits pagination 2015-01-17 14:54:54 -08:00
Hannes Rosenögger 8243eb3f0e Show tags in commit view 2015-01-17 19:22:35 +01:00
Hannes Rosenögger e460e04e16 Add Diff syntax colors for email-on-push notifications 2015-01-17 19:19:28 +01:00
Hannes Rosenögger b0ec61500e Fixes the sort dropdown goind outside of the screen
see gitlab-org/gitlab-ce#986
2015-01-17 16:39:29 +01:00
Dmitriy Zaporozhets e7f772550c Add tests to home page url redirect 2015-01-16 16:09:20 -08:00
Dmitriy Zaporozhets 41d7be3ce1 Allow to specify home page for non logged-in users 2015-01-16 16:01:15 -08:00
Dmitriy Zaporozhets 33f27fcb6a Remvoe unnecessary expand buttons 2015-01-15 23:34:30 -08:00
Dmitriy Zaporozhets 4dfa1ed269 Add some mobile fixes to UI 2015-01-15 23:24:30 -08:00
Carlos Ribeiro 714ef62264 Fix the email variable substituation in ssh help page 2015-01-15 23:06:32 -02:00
Dmitriy Zaporozhets eb84ee7a20 Better label for diffs 2015-01-15 15:19:58 -08:00
Dmitriy Zaporozhets 41f09bed82 Re-order admin dashboard 2015-01-15 15:19:04 -08:00
Dmitriy Zaporozhets 500dab098b Merge pull request #8568 from Sheigutn/master
Add support for colored header on Android Lollipop with Chrome
2015-01-15 14:42:58 -08:00
Dmitriy Zaporozhets 11591573e1 Merge pull request #7925 from cirosantilli/unused-arguments
Remove or prepend underscore _ to unused method arguments
2015-01-15 14:42:03 -08:00
Dmitriy Zaporozhets 6f78be4d62 Merge pull request #7951 from cirosantilli/uniform-blob-edit
Make blob new and edit file editors more uniform
2015-01-15 14:38:07 -08:00
Dmitriy Zaporozhets 892be53fa3 Merge pull request #8425 from rumpelsepp/rouge
Replace highlight.js with rouge-fork rugments
2015-01-15 14:28:24 -08:00
Dmitriy Zaporozhets 089df35f02 Merge branch 'remove-password-strength-indicator' into 'master'
Remove password strength indicator

We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.

See merge request !1399
2015-01-15 19:20:43 +00:00
Dmitriy Zaporozhets c6ab8d04e8 Fix tabindex for comment form 2015-01-15 10:34:40 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
2015-01-15 14:10:13 +01:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets 1e0f36b42a Merge branch 'fix-comments' into 'master'
Fix comments

Fixes:

* drag-n-drop works for diff comments
* selecting images works for diff comments
* preview works for edit comments
* drag-n-drop works for edit comments
* selecting images works for edit comments
* if comment presented on 'Discussion' and 'Changes' tabs - after edit it updates on both tabs.
* Correctly hide form when edit comment on diff
* fix full-screen for diff comments

See merge request !1398
2015-01-15 09:18:10 +00:00
Dmitriy Zaporozhets cad685e70b Refactor zen mode. Make it works in diffs 2015-01-15 00:15:12 -08:00
Dmitriy Zaporozhets 4babc50eb7 Huge set of fixes for comments logic 2015-01-14 22:42:58 -08:00
Sytse Sijbrandij f8b97b454b Make view link come first so I don't have to mouse to the end of the email line. 2015-01-14 21:12:16 -08:00
Dmitriy Zaporozhets c9bdc03bd9 Improve layout css 2015-01-14 18:42:25 -08:00
Dmitriy Zaporozhets 46ed6fb58f Revert "Fix anchor issue with fixed navbar"
This reverts commit 204b3c121c.
2015-01-14 17:22:36 -08:00
Dmitriy Zaporozhets 204b3c121c Fix anchor issue with fixed navbar
When use anchors - conetent gets hidden under navbar. This commit fixes
with hack using margin+height combination
2015-01-14 15:22:31 -08:00
Sheigutn 63924efeaf Add support for colored header on Android Lollipop with Chrome 2015-01-13 21:04:04 +01:00
Dmitriy Zaporozhets 1e37e8924a Improve github import page UI 2015-01-13 11:44:17 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer'
Conflicts:
	app/helpers/projects_helper.rb
2015-01-13 10:35:16 -08:00
Dmitriy Zaporozhets ef933a4a96 Improve import page 2015-01-13 10:34:01 -08:00
yglukhov c13f420b66 First entry in wiki history leads to newest revision. 2015-01-13 12:17:05 +02:00
Marin Jankovski 0a089661fd Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class. 2015-01-12 13:35:29 +01:00
Dmitriy Zaporozhets 4666515538 Merge branch 'flatten-dirs' into 'master'
Flatten the directory hierarchy while there is only one directory descendant

In some languages, especially java, the directory structure reflects the package structure.This means that using the file tree browser to reach the directories that matter you have to click a lot of directories containing only another subdirectory.

This merge request tries to enhance this by showing and providing the link to the first directory that doesn't contain only one directory.

See also [this feature request](http://feedback.gitlab.com/forums/176466-general/suggestions/6236769-jump-forward-to-the-first-folder-that-has-more-tha)

This is very similar to what [GitHub does](https://github.com/blog/1877-folder-jumping), but I don't think graying out the empty directories is really necessary.

Screenshots: [Before](https://gitlab.com/uploads/marmis85/gitlab-ce/b683a0000f/before.png) - [After](https://gitlab.com/uploads/marmis85/gitlab-ce/a23725a1c1/after.png)

I'm actually very new at ruby, rails, haml, and almost everything involved in Gitlab's development...
From what I could understand, when we render each directory item in the list we only have the data structure representing the item but not his descendants.
To iterate through the hierarchy I call Gitlab::Git:Tree.where() but I'm not sure if this is the most efficient way.

I also considered making every directory a clickable link, but I tried that and in the end it wasn't very useful and reduced the click target for the most useful directory.

See merge request !275
2015-01-11 04:42:28 +00:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00