Commit Graph
805 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets cab72628ff Merge branch 'master' into 'master'
Adds new label color suggestions

This adds a bunch of label color suggestions

![labels2](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ac1a207575/labels2.png)
![labels1](https://gitlab.com/uploads/benny/gitlab-ce/d47fbecc16/labels1.png)

See merge request !289
2015-02-12 07:17:46 +00:00
Nikita Verkhovin 8681cb3137 Add labels notes 2015-02-08 22:35:41 +06:00
Dmitriy Zaporozhets dd8dd92e50 Merge branch 'api-default-order' into 'master'
Sorting refactoring

* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope

See merge request !1476
2015-02-06 18:08:44 +00:00
Dmitriy Zaporozhets bbca6a0abd Refactor sorting in project 2015-02-05 19:15:05 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Dmitriy Zaporozhets 254a63dcf7 Improve collapsing sidebar 2015-02-03 13:11:33 -08:00
Dmitriy Zaporozhets ded30e3efe Merge branch 'collapseable-nav' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav 2015-02-03 12:05:11 -08:00
Jason Blanchard ee955d7a12 Adds persistent collapse button for left side bar 2015-02-03 11:45:33 -05:00
Dmitriy Zaporozhets 61cc6a9244 Rubocop: indentation fixes Yay!!! 2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets d04344373b Rubocop: no trailing newlines 2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets 7d48205c1a Rubocop: comment indentation 2015-02-02 21:34:16 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets afb8ecc3d1 Fix syntax error 2015-02-02 20:02:46 -08:00
Dmitriy Zaporozhets 4f1d1fc51b Convert hashes to ruby 1.9 style 2015-02-02 19:30:09 -08:00
Dmitriy Zaporozhets 71ebf3aa1c Merge pull request #8670 from tsigo/rs-fa-icon-helper
Add icon helper method
2015-01-29 22:42:37 -08:00
Marin Jankovski c6c7552e41 Build the urls inside of the service. 2015-01-28 13:19:32 -08:00
Robert Speicher 4e7a4cd956 Use icon helper method in helper modules 2015-01-28 03:48:18 -05:00
Robert Speicher fe831dcd6f Move spinner helper into IconsHelper
Also updates it to use the new `icon` method.
2015-01-28 03:37:44 -05:00
Robert Speicher 8633bbc9b8 Add icon helper method 2015-01-28 03:37:44 -05:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'
Move external issue tracker away from yml config

See merge request !1442
2015-01-27 20:57:48 +00:00
Valery Sizov 79ca8146f3 Merge branch 'github-no-omniauth' into 'master'
Don't require omniauth to enable github importer

I noticed the github importer is only enabled when omniauth authentication is also enabled. That isn't actually necessary -- just the oauth keys from GitHub are required to be configured.

The fix for this is very simple.

See merge request !316
2015-01-27 18:33:09 +00:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
2015-01-26 22:12:53 -08:00
Dmitriy Zaporozhets aac36b120e Fix app title when browse blob 2015-01-26 19:28:11 -08:00
Dmitriy Zaporozhets 21297e78af Refactor blob helpers 2015-01-26 15:03:14 -08:00
Marco Wessel 05b6bb4bf7 Don't require omniauth to be enabled, to use github importer 2015-01-26 21:25:13 +01:00
Marin Jankovski 65e700472b Update the issue tracker attribute on issue tracker change. 2015-01-26 11:39:32 -08:00
Dmitriy Zaporozhets 3588a07b83 Remove default project icon 2015-01-24 23:08:52 -08:00
Dmitriy Zaporozhets b92449c73e Predefine colors for project identicons 2015-01-24 22:03:30 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Marin Jankovski c70dcd2907 Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 2015-01-23 12:38:46 -08:00
Marin Jankovski a720dde67c Remove configuration option from project settings page for external issue trackers. 2015-01-23 11:55:41 -08:00
Marin Jankovski 041bad0fe1 Manipulate external tracker issues urls generated from services. 2015-01-23 11:10:06 -08:00
Marin Jankovski 7c701acf57 Do a check which issue tracker is used inside the project. 2015-01-23 11:01:09 -08:00
Marin Jankovski 103a1bb06d Use service settings instead of config file settings to present issues. 2015-01-23 10:28:38 -08:00
Dmitriy Zaporozhets 7411fb36c5 Show branches/tags as labels on commit page 2015-01-22 11:15:21 -08:00
Dmitriy Zaporozhets 2b10520b30 Merge pull request #7999 from cirosantilli/append-inplace
Append in place for strings and arrays [failure unrelated]
2015-01-21 23:07:15 -08:00
Dmitriy Zaporozhets 7d1e6f1546 Merge pull request #8607 from skburgart/fix-typos
Fix various typos
2015-01-21 23:02:48 -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 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 ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Headless 3d2aaa169e show diff in submodules 2015-01-19 17:18:08 +03:00
Dmitriy Zaporozhets 3e17d15661 Improve edited ago helpers 2015-01-18 19:39:29 -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 539be2441a Merge pull request #8176 from yglukhov/stability-fix
Stability improvement
2015-01-18 10:36:26 -08:00
Steven Burgart 5c80160218 Fix various typos
signe-in -> signed-in
go_to_gihub_for_permissions -> go_to_github_for_permissions
descendand -> descendant
behavour -> behaviour
recepient_email -> recipient_email
generate_fingerpint -> generate_fingerprint
dependes -> depends
Cant't -> Can't
wisit -> visit
notifcation -> notification
sufficent_scope -> sufficient_scope?
levet -> level
2015-01-18 10:29:37 -05:00
Hannes Rosenögger 8243eb3f0e Show tags in commit view 2015-01-17 19:22:35 +01:00