Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
a42714a0
Commit
a42714a0
authored
Jul 08, 2016
by
tiagonbotelho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rename-repo-files' of gitlab.com:tiagonbotelho/gitlab-ce into rename-repo-files
parents
36dc6638
56e62df5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
83 additions
and
77 deletions
+83
-77
Gemfile.lock
Gemfile.lock
+82
-77
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+1
-0
No files found.
Gemfile.lock
View file @
a42714a0
...
...
@@ -57,14 +57,13 @@ GEM
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.0)
asciidoctor (1.5.
3
)
ast (2.
2
.0)
asciidoctor (1.5.
4
)
ast (2.
3
.0)
attr_encrypted (3.0.1)
encryptor (~> 3.0.0)
attr_required (1.0.
0
)
autoprefixer-rails (6.
2.3
)
attr_required (1.0.
1
)
autoprefixer-rails (6.
3.7
)
execjs
json
awesome_print (1.2.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
...
...
@@ -88,7 +87,7 @@ GEM
babosa (1.0.2)
base32 (0.3.2)
bcrypt (3.1.11)
benchmark-ips (2.
3.0
)
benchmark-ips (2.
6.1
)
better_errors (1.0.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
...
...
@@ -100,13 +99,13 @@ GEM
brakeman (3.3.2)
browser (2.2.0)
builder (3.2.2)
bullet (5.
0.0
)
bullet (5.
1.1
)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.
9
.0)
uniform_notifier (~> 1.
10
.0)
bundler-audit (0.5.0)
bundler (~> 1.2)
thor (~> 0.18)
byebug (
8.2.1
)
byebug (
9.0.5
)
capybara (2.6.2)
addressable
mime-types (>= 1.16)
...
...
@@ -114,7 +113,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-screenshot (1.0.1
1
)
capybara-screenshot (1.0.1
3
)
capybara (>= 1.0, < 3)
launchy
carrierwave (0.10.0)
...
...
@@ -126,9 +125,9 @@ GEM
charlock_holmes (0.7.3)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)
chunky_png (1.3.
5
)
chunky_png (1.3.
6
)
cliver (0.3.2)
coderay (1.1.
0
)
coderay (1.1.
1
)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
coffee-rails (4.1.1)
...
...
@@ -138,15 +137,15 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
colorize (0.
7.7
)
colorize (0.
8.1
)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
crack (0.4.3)
safe_yaml (~> 1.0.0)
creole (0.5.0)
css_parser (1.4.
1
)
css_parser (1.4.
5
)
addressable
d3_rails (3.5.1
1
)
d3_rails (3.5.1
6
)
railties (>= 3.1.0)
daemons (1.2.3)
database_cleaner (1.4.1)
...
...
@@ -156,7 +155,7 @@ GEM
activerecord (>= 3.2.0, < 5.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.
1.1
)
devise (4.
2.0
)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1)
...
...
@@ -173,7 +172,7 @@ GEM
docile (1.1.5)
doorkeeper (4.0.0)
railties (>= 4.2)
dropzonejs-rails (0.7.
2
)
dropzonejs-rails (0.7.
3
)
rails (> 3.1)
email_reply_parser (0.5.8)
email_spec (1.6.0)
...
...
@@ -183,9 +182,9 @@ GEM
equalizer (0.0.11)
erubis (2.7.0)
escape_utils (1.1.1)
eventmachine (1.
0.8
)
excon (0.
49.0
)
execjs (2.
6
.0)
eventmachine (1.
2.0.1
)
excon (0.
50.1
)
execjs (2.
7
.0)
expression_parser (0.9.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
...
...
@@ -200,18 +199,21 @@ GEM
faraday_middleware
multi_json
ffaker (2.0.0)
ffi (1.9.10)
flay (2.6.1)
ffi (1.9.13)
flay (2.8.0)
erubis (~> 2.7.0)
path_expander (~> 1.0)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
flog (4.3.2)
flog (4.4.0)
path_expander (~> 1.0)
ruby_parser (~> 3.1, > 3.1.0)
sexp_processor (~> 4.4)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
fog-aws (0.9.
2
)
fog-core (~> 1.
27
)
fog-aws (0.9.
4
)
fog-core (~> 1.
38
)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
...
...
@@ -220,7 +222,7 @@ GEM
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
fog-core (1.4
0
.0)
fog-core (1.4
2
.0)
builder
excon (~> 0.49)
formatador (~> 0.2)
...
...
@@ -233,8 +235,8 @@ GEM
multi_json (~> 1.10)
fog-local (0.3.0)
fog-core (~> 1.27)
fog-openstack (0.1.
6
)
fog-core (>= 1.
39
)
fog-openstack (0.1.
7
)
fog-core (>= 1.
40
)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-rackspace (0.1.1)
...
...
@@ -245,9 +247,9 @@ GEM
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
font-awesome-rails (4.6.
1.0
)
font-awesome-rails (4.6.
3.1
)
railties (>= 3.2, < 5.1)
foreman (0.
78
.0)
foreman (0.
82
.0)
thor (~> 0.19.1)
formatador (0.2.5)
fuubar (2.0.0)
...
...
@@ -257,7 +259,7 @@ GEM
rugged (~> 0.21)
gemojione (2.6.1)
json
get_process_mem (0.2.
0
)
get_process_mem (0.2.
1
)
gherkin-ruby (0.3.2)
github-linguist (4.7.6)
charlock_holmes (~> 0.7.3)
...
...
@@ -274,7 +276,7 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
gitlab_git (10.
2.3
)
gitlab_git (10.
3.0
)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)
...
...
@@ -287,7 +289,7 @@ GEM
rubyntlm (~> 0.3)
globalid (0.3.6)
activesupport (>= 4.1.0)
gollum-grit_adapter (1.0.
0
)
gollum-grit_adapter (1.0.
1
)
gitlab-grit (~> 2.7, >= 2.7.1)
gollum-lib (4.1.0)
github-markup (~> 1.3.3)
...
...
@@ -321,10 +323,10 @@ GEM
temple (~> 0.7.6)
thor
tilt
hashie (3.4.
3
)
hashie (3.4.
4
)
health_check (1.5.1)
rails (>= 2.3.0)
hipchat (1.5.
2
)
hipchat (1.5.
3
)
httparty
mimemagic
html-pipeline (1.11.0)
...
...
@@ -335,10 +337,10 @@ GEM
httparty (0.13.7)
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.
7.0.1
)
httpclient (2.
8.0
)
i18n (0.7.0)
ice_nine (0.11.
1
)
influxdb (0.
2.3
)
ice_nine (0.11.
2
)
influxdb (0.
3.5
)
cause
json
ipaddress (0.8.3)
...
...
@@ -358,7 +360,7 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.10.0)
knapsack (1.11.
0
)
knapsack (1.11.
1
)
rake
timecop (>= 0.1.0)
launchy (2.4.3)
...
...
@@ -369,7 +371,7 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
license_finder (2.1.
0
)
license_finder (2.1.
2
)
bundler
httparty
rubyzip
...
...
@@ -377,9 +379,10 @@ GEM
xml-simple
licensee (8.0.0)
rugged (>= 0.24b)
listen (3.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
macaddr (1.7.1)
...
...
@@ -389,18 +392,18 @@ GEM
mail_room (0.8.0)
method_source (0.8.2)
mime-types (2.99.2)
mimemagic (0.3.
0
)
mimemagic (0.3.
1
)
mini_portile2 (2.1.0)
minitest (5.7.0)
mousetrap-rails (1.4.6)
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
mysql2 (0.3.2
0
)
mysql2 (0.3.2
1
)
nested_form (0.3.2)
net-ldap (0.1
2.1
)
net-ssh (3.0.
1
)
newrelic_rpm (3.1
4.1.311
)
net-ldap (0.1
4.0
)
net-ssh (3.0.
2
)
newrelic_rpm (3.1
6.0.318
)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
...
...
@@ -417,7 +420,7 @@ GEM
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-auth0 (1.4.
1
)
omniauth-auth0 (1.4.
2
)
omniauth-oauth2 (~> 1.1)
omniauth-azure-oauth2 (0.0.6)
jwt (~> 1.0)
...
...
@@ -436,7 +439,7 @@ GEM
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-gitlab (1.0.
1
)
omniauth-gitlab (1.0.
2
)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-google-oauth2 (0.2.10)
...
...
@@ -471,10 +474,11 @@ GEM
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
paranoia (2.1.
4
)
paranoia (2.1.
5
)
activerecord (~> 4.0)
parser (2.3.1.
0
)
parser (2.3.1.
2
)
ast (~> 2.2)
path_expander (1.0.0)
pg (0.18.4)
pkg-config (1.1.7)
poltergeist (1.9.0)
...
...
@@ -484,10 +488,10 @@ GEM
websocket-driver (>= 0.2.0)
posix-spawn (0.3.11)
powerpack (0.1.1)
premailer (1.8.
6
)
css_parser (>= 1.
3.6
)
premailer (1.8.
7
)
css_parser (>= 1.
4.5
)
htmlentities (>= 4.0.0)
premailer-rails (1.9.
2
)
premailer-rails (1.9.
4
)
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
pry (0.10.3)
...
...
@@ -505,7 +509,7 @@ GEM
rack-cors (0.4.0)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-oauth2 (1.2.
1
)
rack-oauth2 (1.2.
3
)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
...
...
@@ -540,19 +544,19 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
raindrops (0.1
5
.0)
raindrops (0.1
6
.0)
rake (10.5.0)
rb-fsevent (0.9.
6
)
rb-inotify (0.9.
5
)
rb-fsevent (0.9.
7
)
rb-inotify (0.9.
7
)
ffi (>= 0.5.0)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
rdoc (3.12.2)
json (~> 1.4)
recaptcha (3.
0
.0)
recaptcha (3.
3
.0)
json
redcarpet (3.3.
3
)
redis (3.
2.2
)
redcarpet (3.3.
4
)
redis (3.
3.0
)
redis-actionpack (4.0.1)
actionpack (~> 4)
redis-rack (~> 1.5.0)
...
...
@@ -571,23 +575,23 @@ GEM
redis-store (~> 1.1.0)
redis-store (1.1.7)
redis (>= 2.2)
request_store (1.3.
0
)
request_store (1.3.
1
)
rerun (0.11.0)
listen (~> 3.0)
responders (2.
1.1
)
responders (2.
2.0
)
railties (>= 4.2.0, < 5.1)
rinku (2.0.0)
rotp (2.1.2)
rouge (1.11.
0
)
rqrcode (0.
7.0
)
chunky_png
rouge (1.11.
1
)
rqrcode (0.
10.1
)
chunky_png
(~> 1.0)
rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.
0
)
rspec-core (3.5.
1
)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
...
...
@@ -595,7 +599,7 @@ GEM
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-rails (3.5.
0
)
rspec-rails (3.5.
1
)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
...
...
@@ -619,12 +623,13 @@ GEM
ruby-progressbar (1.8.1)
ruby-saml (1.3.0)
nokogiri (>= 1.5.10)
ruby_dep (1.3.1)
ruby_parser (3.8.2)
sexp_processor (~> 4.1)
rubyntlm (0.
5.2
)
rubyntlm (0.
6.0
)
rubypants (0.2.0)
rubyzip (1.2.0)
rufus-scheduler (3.
1.10
)
rufus-scheduler (3.
2.1
)
rugged (0.24.0)
safe_yaml (1.0.4)
sanitize (2.1.0)
...
...
@@ -648,7 +653,7 @@ GEM
seed-fu (2.3.6)
activerecord (>= 3.1)
activesupport (>= 3.1)
select2-rails (3.5.
9.3
)
select2-rails (3.5.
10
)
thor (~> 0.14)
sentry-raven (1.1.0)
faraday (>= 0.7.6)
...
...
@@ -663,7 +668,7 @@ GEM
connection_pool (~> 2.2, >= 2.2.0)
redis (~> 3.2, >= 3.2.1)
sinatra (>= 1.4.7)
sidekiq-cron (0.4.
0
)
sidekiq-cron (0.4.
2
)
redis-namespace (>= 1.5.2)
rufus-scheduler (>= 2.0.24)
sidekiq (>= 4.0.0)
...
...
@@ -697,7 +702,7 @@ GEM
spring (>= 0.9.1)
spring-commands-teaspoon (0.0.2)
spring (>= 0.9.1)
sprockets (3.6.
2
)
sprockets (3.6.
3
)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.1.1)
...
...
@@ -758,7 +763,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.
0.5
)
unicode-display_width (1.
1.0
)
unicorn (4.9.0)
kgio (~> 2.6)
rack
...
...
@@ -766,7 +771,7 @@ GEM
unicorn-worker-killer (0.4.4)
get_process_mem (~> 0)
unicorn (>= 4, < 6)
uniform_notifier (1.
9
.0)
uniform_notifier (1.
10
.0)
uuid (2.3.8)
macaddr (~> 1.0)
version_sorter (2.0.0)
...
...
@@ -786,7 +791,7 @@ GEM
webmock (1.21.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
websocket-driver (0.6.
3
)
websocket-driver (0.6.
4
)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
wikicloth (0.8.1)
...
...
app/views/projects/blob/_editor.html.haml
View file @
a42714a0
...
...
@@ -7,6 +7,7 @@
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
=
text_field_tag
'file_name'
,
(
params
[
:file_name
]
||
@path
),
class:
'form-control new-file-name'
-
if
current_action?
(
:new
)
||
current_action?
(
:create
)
%span
.editor-file-name
\/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment