8344c79508
fixed conflict and comment
2015-08-10 16:03:10 -07:00
9195d65602
Doc: Fix link to gravatar.com
2015-08-10 23:47:32 +02:00
ce30eb2b97
Merge branch 'gitdocfix' into 'master'
...
Fix instructions for empty repo + existing files
Fixes #2242
See merge request !1132
2015-08-10 20:49:04 +00:00
773545d533
Fix instructions for empty repo + existing files
...
Fixes #2242
2015-08-10 14:53:44 -04:00
e6ef058289
Disable turbolinks when linking to Bitbucket import status
...
Turbolinks was causing issues with the Bitbucket Javascript/display because it
was trying to intercept /import/bitbucket/status even when a 302 redirection occured.
Closes #2241
2015-08-10 11:44:39 -07:00
b99cbf47af
Database size
2015-08-10 18:39:50 +00:00
01af2c98b6
Merge branch 'update-changelog' into 'master'
...
Add dropzone upload progress to CHANGELOG
This MR adds dropzone upload progress entry to CHANGELOG.
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1125#note_1865958
See merge request !1130
2015-08-10 17:36:23 +00:00
78df90d6b8
Add dropzone upload progress to CHANGELOG
2015-08-10 23:23:54 +06:00
6e7bf50ba6
Merge branch 'fix-diff-highlighting' into 'master'
...
Fix diff syntax highlighting
### What does this MR do?
This MR fixes a syntax highlighting issue that that manifested itself when a user tried the following:
```
+aaa
+bbb
ccc
```
However, a regression in 0abe98f0https://gitlab.com/stanhu/gitlab-ce/uploads/a16515499d5e3fd9737370d89c73f671/image.png )
Instead of this:
This bug occurred because of some error in the logic of handling new lines in the content. Refactored HTML parser to avoid duplication of newline parsing.
### What are the relevant issue numbers?
Closes #2235
See merge request !1126
2015-08-10 15:55:44 +00:00
15d5dfdb33
Fix diff syntax highlighting
...
Refactored HTML parser to avoid duplication of newline parsing.
Closes #2235
2015-08-10 08:07:26 -07:00
e051a558ce
Bump Haml to 4.0.7 to speed up textarea rendering
...
Closes #1987
2015-08-10 08:02:23 -07:00
6a6697c393
Add README to list of files in project page if activity feed setting in use
...
Closes #2044
2015-08-10 07:31:57 -07:00
39bda5d05e
Merge branch 'disable-autocrlf-for-binary-files' into 'master'
...
Fix corrupted binary files when using API files endpoint
Closes #2219
See merge request !1123
2015-08-10 14:04:07 +00:00
3bb2aa9f98
Link username to profile on Group Members page
...
When browsing GitLab, a user may want to view a particular user's
other contributions or profile information. This link helps make
that process seamless.
2015-08-10 08:32:17 -04:00
4a2b7cef57
Merge branch 'master' into check-out-branch-button
2015-08-10 14:16:40 +02:00
b716e45de1
Fix spec
2015-08-10 14:15:27 +02:00
151d9fb35f
Merge branch 'mr-widget-text' into 'master'
...
Improve text of MR merge widget and manual merge modal
Modal with manual merge instructions:
Archived:
WIP:
Missing target branch:
Missing source branch:
Nothing to merge:
Checking ability to merge:
Conflicts when allowed to merge:
Conflicts when not allowed to merge:
Mergeable when allowed to merge:
Mergeable when not allowed to merge:
Merge in progress:
Merge failed:
Merged:
Closed:
cc @dzaporozhets @rspeicher
See merge request !1120
2015-08-10 12:13:26 +00:00
819d110cab
Merge branch 'trigger-hooks' into 'master'
...
Trigger post-receive hooks after commits are made by GitLab
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1127
2015-08-10 11:57:53 +00:00
3752172dcd
Merge branch 'fix-event-cache' into 'master'
...
Fix event cache
Fixes #2236 .
See merge request !1128
2015-08-10 11:17:05 +00:00
59e7b7a654
Refactor Trigger post-receive hooks after commits are made by GitLab
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-10 13:15:36 +02:00
0d1c260122
Fix event cache
2015-08-10 12:31:34 +02:00
99585a738c
Trigger post-receive hoooks when commits are made by GitLab
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-10 10:54:42 +02:00
77f37fa909
Merge branch 'dropzone-upload-progress' into 'master'
...
Add dropzone upload progress
This MR adds upload progress in percents to dropzone.
I thought, it can be nice small enhancement :)
See merge request !1125
2015-08-10 08:05:37 +00:00
17bab5022f
Add dropzone upload progress
2015-08-10 13:18:02 +06:00
fb6f8d9198
Merge branch 'rs-reference-data-attrs' into 'master'
...
Add `data-[type]-id` attribute to reference links
This is to let us redact them later in another filter.
See merge request !1110
2015-08-10 00:07:56 +00:00
1a3283d4e8
Merge branch 'gravatar-host-link' into 'master'
...
link to configured gravatar host on profile page
This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service.
See merge request !1093
2015-08-09 22:42:07 +00:00
c5648de230
Fix corrupted binary files when using API files endpoint
...
Add CHANGELOG for gitlab_git 7.2.9 updates
Closes #2219
2015-08-09 15:23:22 -07:00
78fba275c9
More textual tweaks
2015-08-09 17:46:25 +02:00
22285b1d39
Merge branch 'master' into check-out-branch-button
2015-08-09 17:41:31 +02:00
7b7802377e
Merge branch 'master' into mr-widget-text
2015-08-09 17:40:59 +02:00
e6bf9aa719
Make modal narrower
2015-08-09 17:34:28 +02:00
1567914f7c
Drop the user name from tree row to improve readability of commit messages
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-08-09 14:40:16 +02:00
b833f208f3
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-09 10:31:38 +02:00
1309aeb871
Merge branch 'ui-improvements' into 'master'
...
Ui improvements
* revert of wrong patch
* spall margin change
Explanation with screenshots here - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/579#note_1845510
See merge request !1117
2015-08-09 08:30:48 +00:00
efb17e0599
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-09 00:51:20 -07:00
91083d9ebb
Merge pull request #9543 from rumpelsepp/english
...
Improve abuse report wording
2015-08-09 00:45:47 -07:00
8ceb7c0515
Merge branch 'rs-fix-msapplication-tileimage' into 'master'
...
Fix transparency for msapplication-tile image
See merge request !1122
2015-08-09 02:04:57 +00:00
48cf97e8d3
Merge branch 'cache-events' into 'master'
...
Cache all events
Use CSS to determine if the current user needs to see "Congratulations! Tweet about it" by project creation events and "Create Merge Request" by push events.
Implemented as described here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/911#note_1559710
Addresses #2054 , in part.
cc @dzaporozhets
See merge request !1103
2015-08-09 02:03:46 +00:00
3f045b25d7
Fix transparency for msapplication-tile image
...
[ci skip]
2015-08-08 22:03:00 -04:00
32e63ba7a1
Add `data-[type]-id` attribute to reference links
...
This is to let us redact them later in another filter.
2015-08-08 16:43:29 -04:00
5ac504e394
Fix changelog.
2015-08-08 21:58:40 +02:00
211fe02848
Tweak MR widget text some more.
2015-08-08 21:51:50 +02:00
b2334da40e
Improve text in MR "How To Merge" modal.
2015-08-08 21:51:42 +02:00
9049cdff5a
Add "Check out branch" button to the MR page.
2015-08-08 21:27:29 +02:00
b8590da024
Improve MR merge widget text and UI consistency.
2015-08-08 21:24:43 +02:00
6783437ce5
Improve abuse report wording
2015-08-08 19:46:34 +02:00
a71bed53e0
Merge branch 'merge-notifs' into 'master'
...
See merge request !1077
2015-08-07 18:47:02 -04:00
082467e8e6
Info about not receiving emails
2015-08-07 13:07:04 -07:00
8ab6bd3eb3
Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227
2015-08-07 22:13:18 +03:00
59c486dcc1
Merge branch 'fix-changelog-versions' into 'master'
...
Fix CHANGELOG entries to belong in the right version
Reorder entries that were improperly grouped (one fix mentioned in #1522 ).
See merge request !1118
2015-08-07 17:28:41 +00:00
karen Carias
Jan Tojnar
Achilleas Pipinellis
Jeff Blaine
Stan Hu
Sytse Sijbrandij (admin)
Nikita Verkhovin
Douwe Maan
Tom Webster
Dmitriy Zaporozhets
Robert Speicher
Sven Strickroth
Stan Hu
Robert Speicher
Stefan Tatschner
