Commit Graph
4837 Commits
Author SHA1 Message Date
Marin Jankovski a720dde67c Remove configuration option from project settings page for external issue trackers. 2015-01-23 11:55:41 -08:00
Marin Jankovski 7c701acf57 Do a check which issue tracker is used inside the project. 2015-01-23 11:01:09 -08:00
Dmitriy Zaporozhets 99736d4594 Make all avatars rounded for consistency 2015-01-23 10:39:23 -08:00
Dmitriy Zaporozhets b1dffe6729 Merge branch 'disable-turbolink-on-ci-links' into 'master'
Disable turbolink on links pointing out to CI services

### What does this MR do?

This MR adds 'data-no-turbolink' attribute into all links pointing to CI services.

### Are there points in the code the reviewer needs to double check?

No

### Why was this MR needed?

In rare cases where gitlab and CI service is installed on the same host, turbolink will be used for links between those two. This may result in corrupted css and javascript.

This change is harmless for installations that do not share the domain name for GitLab and CI system - in such case, all links modified are already pointing out outside of the domain so turbolink won't handle them.

### What are the relevant issue numbers / Feature requests?

I consider this a small fix, no issue has been added.

See merge request !305
2015-01-22 23:04:43 +00:00
Dmitriy Zaporozhets 4a10b7509a Merge branch 'gh-import-disabled' into 'master'
Show modal window with instructions if GitHub integration disabled

See merge request !1424
2015-01-22 22:48:10 +00:00
Dmitriy Zaporozhets 130663e7ad Show modal window with instructions if GH OAuth is not enables 2015-01-22 11:48:20 -08:00
Dmitriy Zaporozhets 7411fb36c5 Show branches/tags as labels on commit page 2015-01-22 11:15:21 -08:00
Dmitriy Zaporozhets 7f1633e294 Merge pull request #7615 from yglukhov/new-branch-submit-button-validation
Validation of 'Create branch' and 'Create tag' buttons
2015-01-21 23:05:02 -08:00
Dmitriy Zaporozhets 581b2c5e90 Merge branch 'vote-count' of https://github.com/mc1arke/gitlabhq into mc1arke-vote-count
Conflicts:
	CHANGELOG
2015-01-21 22:40:12 -08:00
Dmitriy Zaporozhets 111d95f7b0 Merge pull request #8614 from axilleas/disable_check_all_issues_for_unprivileged_users
Disable 'check all issues' checkbox for unprivileged users.
2015-01-21 22:35:09 -08:00
Dmitriy Zaporozhets 2ac03a8661 Merge pull request #8626 from dblessing/fix_spinner
Fix spinner icon to match others
2015-01-21 22:33:19 -08:00
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
Drew Blessing 855fe20165 Fix spinner icon to match others 2015-01-21 14:02:30 -06: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
GitLabandBartlomiej Swiecki 47e0614669 Disable turbolink on links pointing out to ci services 2015-01-20 12:19:16 +01:00
Achilleas Pipinellis 46755a7bfe Disable 'check all issues' checkbox for unprivileged users. 2015-01-20 09:16:26 +02: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
Michael Clarke 505a492cd8 Only count the user's last vote 2015-01-19 21:18:36 +00: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
Ciro Santilli 55d9809055 Convert Javascript links to buttons. 2015-01-17 19:50:41 +01: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
Timo Lilja 09152bad0c Fix "500: Encoding error" on blame view
This change forces encoding of source line data into UTF-8 and thus
fixes the encoding error at least partially. The issue is described in
https://gitlab.com/gitlab-org/gitlab-ce/issues/894
2015-01-17 16:15:20 +02: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