Dmitriy Zaporozhets
863f3873bc
Merge branch 'rubycop-improvements' into 'master'
...
Rubycop improvements
See merge request !1463
2015-02-03 08:17:31 +00: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
615bb94135
Rubocop: Dont allow puts or print to stdout
2015-02-02 21:41:38 -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
7558fe9875
More rubocop rules enable
2015-02-02 21:31:03 -08:00
Dmitriy Zaporozhets
368e9a0862
Rubocop: Style/CaseIndentation enabled
2015-02-02 21:26:40 -08:00
Dmitriy Zaporozhets
8c577a5771
Merge branch 'rubocop-spaces-hash' into 'master'
...
Rubocop enabled for: Use spaces inside hash literal braces
See merge request !1461
2015-02-03 05:23:22 +00:00
Dmitriy Zaporozhets
da884aabc7
Avoid using {...} for multi-line blocks
2015-02-02 21:22:57 -08:00
Dmitriy Zaporozhets
6579c336f9
Rubocop: Ascii restrictions
2015-02-02 21:20:34 -08:00
Dmitriy Zaporozhets
cc39bca3fa
Rubocop: Style/AlignHash enabled
2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets
c427bf08e4
Rubocop: Style/AlignArray enabled
2015-02-02 20:58:28 -08:00
Dmitriy Zaporozhets
9fbdbf8b3f
Rubocop: Style/Alias enabled
2015-02-02 20:57:10 -08:00
Dmitriy Zaporozhets
aaae5e6f5e
Rubocop: Style/AccessorMethodName enabled
2015-02-02 20:55:05 -08:00
Dmitriy Zaporozhets
832b63b538
Merge branch 'ruby-hash-1-9' into 'master'
...
Ruby hash 1.9 with rubycop check
See merge request !1460
2015-02-03 04:48:32 +00:00
Dmitriy Zaporozhets
e890582681
Rubocop enabled for: Use spaces inside hash literal braces
2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets
84a5a548a5
Add rubocop to rake test and rake test_ci
2015-02-02 20:08:23 -08:00
Dmitriy Zaporozhets
afb8ecc3d1
Fix syntax error
2015-02-02 20:02:46 -08:00
Dmitriy Zaporozhets
c8e7928e34
Update CHANGELOG with rubocop
2015-02-02 19:33:57 -08:00
Dmitriy Zaporozhets
4f1d1fc51b
Convert hashes to ruby 1.9 style
2015-02-02 19:30:09 -08:00
Dmitriy Zaporozhets
7dad2663a6
Merge branch 'rubocop' into 'master'
...
Rubocop
See merge request !1459
2015-02-03 03:18:50 +00:00
Dmitriy Zaporozhets
46b6ceeac7
At first disable all checks. We will enable it one by one later
2015-02-02 19:11:45 -08:00
Dmitriy Zaporozhets
76027e5efd
Add rubocop and remove rails_best_practices gem
2015-02-02 18:54:27 -08:00
Dmitriy Zaporozhets
e60fd1f644
Merge branch 'improve-dash-icons' into 'master'
...
Improve project avatars for dashboard
Fixes #1955
See merge request !1457
2015-02-03 00:49:43 +00:00
Dmitriy Zaporozhets
7ba97ab4a5
Web editor documnetation
2015-02-02 16:43:51 -08:00
Job van der Voort
6496dc3cd4
Merge branch 'doc/import' into 'master'
...
Make omnibus the default in repo import docs
I hope this reads nicer for people using omnibus packages.
See merge request !1420
2015-02-03 00:22:53 +00:00
Dmitriy Zaporozhets
2bd70b6a01
Improve project icons for dashboard
2015-02-02 15:47:51 -08:00
Dmitriy Zaporozhets
c0acb28c4e
Annotate models
2015-02-02 10:24:40 -08:00
Marin Jankovski
1bdd3ce463
Merge branch 'search-group' into 'master'
...
Search group documentation
See merge request !1455
2015-02-02 18:05:11 +00:00
Job van der Voort
561a715308
add clear documentation on searching between groups
2015-02-02 10:00:05 -08:00
Dmitriy Zaporozhets
e0ac740962
Merge pull request #8693 from tsigo/master
...
Fix RepositoryCache backend attr_reader
2015-02-02 09:57:57 -08:00
Dmitriy Zaporozhets
ff33140a91
Merge pull request #8698 from tsigo/rs-spec-directories
...
Make the structure of spec/models match app/models
2015-02-02 09:57:34 -08:00
Dmitriy Zaporozhets
47f3218e6f
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-02-02 08:50:32 -08:00
Jeremy
d56c2a9bc5
Fix test
...
Related https://semaphoreapp.com/gitlabhq/gitlabhq/branches/pull-request-8580/builds/9
Asana service doesn't check if restrict_to_branch is defined since it can be undefined
2015-02-02 09:59:43 +01:00
Jeremy
f79b6af18a
Fix HoundCI
2015-02-02 09:59:43 +01:00
Jeremy
3cd1eda5a4
Add restrict_to_branch to service controller
...
And add restrict_to_branch to spec
2015-02-02 09:59:42 +01:00
Jeremy
b4d9ceb26f
Add Asana service
...
Also add ability to render "service.help" in markdown
2015-02-02 09:59:42 +01:00
Marco Cyriacks
7b3fd03155
Add raw image paste fix changelog entry
2015-02-02 09:32:10 +01:00
Marco Cyriacks
a54e9e5459
Fix raw image paste from clipboard
...
This patch binds the textarea (markdown area) paste event to the
handlePaste() function (that was already present).
Furthermore the event processing is improved in the following way:
- The default paste event handler of the browser is only disabled if the
browser fully supports clipboardData AND there realy is image data in
the event object. In all other cases (no support or no image) the
default handler processes the text paste.
- Some obsolete code was removed.
- The pasteText() function (which is somehow buggy because it places the
cursor at the end of the text independantly from its position before the
paste) is only used to place the image link after image data was pasted.
2015-02-01 22:26:34 +01:00
Marco Wessel
ac7af45d89
Add test for default branch protection configuration
2015-01-31 09:10:26 +01:00
Tim Bishop
0fe1c9b648
Fix group search to check path as well as name.
...
The API documentation says:
"You can search for groups by name or path with: /groups?search=Rails"
But you can't because the search query only checks the name, not
the path. This fixes that.
2015-01-30 23:49:01 +00:00
Robert Schilling
03430ad77c
Merge branch 'master' into 'master'
...
Bump GitLab for Docker to version 7.7.2
See merge request !324
2015-01-30 22:31:24 +00:00
Vincent Robert
a7a45dc949
Bump GitLab for Docker to version 7.7.2
2015-01-30 22:29:41 +01:00
Robert Speicher
ab6f7164e0
Make the structure of spec/models match app/models
2015-01-30 15:51:10 -05:00
Ewan Edwards
e6e337088b
Make all non-config/non-operational mentions of URL consistently
...
capitalized.
Make the plural version consistently "URLs".
Fix an instance where the article "the" before URL was missing.
2015-01-30 10:24:45 -08:00
Valery Sizov
693607f8a4
Merge branch 'update-needs-libkrb5-dev' into 'master'
...
Update doc needs libkrb5 dev
People who use the update guide should also install libkrb5-dev.
See merge request !1454
2015-01-30 16:34:22 +00:00
Robert Speicher
8ac227bab2
Fix RepositoryCache backend attr_reader
2015-01-30 10:17:55 -05:00
Jacob Vosmaer
1a1d7085fa
Mention libkrb5-dev dependency
2015-01-30 16:03:27 +01:00
Dmitriy Zaporozhets
c47328948b
Fix specs for icons
2015-01-30 00:22:51 -08:00