Valery Sizov
b9d9ac82a9
Commit page: async load branches info
...
Conflicts:
config/routes.rb
2015-02-03 09:10:56 -08: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
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
4f1d1fc51b
Convert hashes to ruby 1.9 style
2015-02-02 19:30:09 -08:00
Dmitriy Zaporozhets
f1cf49218f
Improve contribution calendar on user page
...
* cache user contributions for day
* ignore forks in calendar contribtuions
2015-01-29 17:07:44 -08:00
Dmitriy Zaporozhets
08582f1532
Improve user calendar authentification and tests
2015-01-29 08:55:57 -08:00
Dmitriy Zaporozhets
1f0e16569f
Load contribution calendar via AJAX
2015-01-29 01:20:17 -08:00
Dmitriy Zaporozhets
a9288e554e
Cleanup and make contribution calendar faster
2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets
c39f80bdb4
Refactor commit calendar a bit. Fixed dates
2015-01-28 23:00:41 -08:00
Dmitriy Zaporozhets
815e9aa283
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar
2015-01-28 22:52:44 -08:00
Hannes Rosenögger
792ced2f41
Add a commit calendar to the user profile
2015-01-29 01:25:26 +01:00
Marin Jankovski
68f7302474
Add a scope for visible services, code styling changes for easier readability.
2015-01-28 14:25:55 -08:00
Marin Jankovski
537cd66d7e
Add gitlab internal issue tracker service.
2015-01-28 09:28:17 -08:00
Marin Jankovski
ededa98995
Shorter check in services controller.
2015-01-26 22:46:54 -08: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
ed91378627
Fix blob controller rendering in case of errors
2015-01-26 15:12:13 -08:00
Dmitriy Zaporozhets
59b08942aa
Refactor blob controllers
2015-01-26 15:02:28 -08:00
Dmitriy Zaporozhets
c916124178
Explicitly set before_filter for ref-related controllers
2015-01-26 15:01:51 -08:00
Marin Jankovski
65e700472b
Update the issue tracker attribute on issue tracker change.
2015-01-26 11:39:32 -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 Thonus and Hannes 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
Dmitriy Zaporozhets
4225dad45e
Merge branch 'ruby-19-hash' into 'master'
...
Ruby 1.9 hash
See merge request !1430
2015-01-24 05:06:12 +00:00
Dmitriy Zaporozhets
a6bdf7d876
Show success/error message for test services button
2015-01-23 20:50:17 -08:00
Dmitriy Zaporozhets
3dfcb95f0d
Use ruby 1.9 hash syntax
2015-01-23 17:41:10 -08:00
Dmitriy Zaporozhets
893a68baf3
Cache autocomplete or emojis
2015-01-23 16:17:27 -08:00
Dmitriy Zaporozhets
a42d84eca3
Faster autocomplete without unused description
2015-01-23 14:38:20 -08:00
Marin Jankovski
c70dcd2907
Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
2015-01-23 12:38:46 -08:00
Dmitriy Zaporozhets
1511999d88
Faster autocomplete for users/issues/emojiis
...
Instead of loading all issues and merge requests we load only open one.
This will reduce time load for autocomplete resources significantly
2015-01-22 17:51:35 -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
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
@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
Marin Jankovski
62c00661c4
Allow creation of the jira and redmine services.
2015-01-20 16:47:29 -08:00
Valery Sizov
6da0ab7d60
Github Importer: AJAX update status
2015-01-20 11:52:55 -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
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
Hannes Rosenögger
8243eb3f0e
Show tags in commit view
2015-01-17 19:22:35 +01:00
Dmitriy Zaporozhets
f2eb234c06
Fix passign args to original authenticate_user!
2015-01-16 18:12:15 -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
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
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
3103e567bc
Merge branch 'fix_constant' into 'master'
...
ForbiddenAction constant name fix
See merge request !1387
2015-01-12 21:19:04 +00:00
Valery Sizov
058f223b01
ForbiddenAction constant fix
2015-01-12 09:30:52 -08:00
Dmitriy Zaporozhets
bba8e59a04
Fix test hook and tests
2015-01-12 09:08:25 -08:00
Valery Sizov
Dmitriy Zaporozhets
Hannes Rosenögger
Marin Jankovski
Steven ThonusandHannes Rosenögger
Dmitriy Zaporozhets
Steven Burgart
