0a5b005da1
Fix blame view line groupings
...
Closes #2305
2015-08-20 01:27:29 -07:00
55fc58bda4
Merge branch '2fa-message-improvement' into 'master'
...
Improved 2FA warning message about lost codes
Fixes internal issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2472
The warning message now clearly states that access will be lost of the 2FA recovery codes are not saved.
/cc @sytses @JobV
See merge request !1175
2015-08-19 23:21:02 +00:00
475bb00bde
Improved 2FA warning message about lost codes
2015-08-19 18:13:01 -05:00
4df4097e32
Merge pull request #9551 from Telekom-PD/feature/search-for-archived-projects
...
Feature/search for archived projects
2015-08-19 08:53:08 -07:00
0719022739
Spinach tests
2015-08-19 13:47:03 +02:00
15cdf551fc
Show colored icons like in the admin listing
2015-08-19 13:47:03 +02:00
10d2281d73
Show label on archived projects
2015-08-19 13:47:03 +02:00
3ebbed25f0
Allow listing of archived projects
...
Resolves #9285
2015-08-19 13:46:59 +02:00
3659d3b5c6
Merge branch 'security' into 'master'
...
Added note about backing up recovery codes
Several people have tried to recover their 2FA codes. I think we could be more clear about it in the docs.
This is why I added a section about it at the top, so they read it before enabling them.
https://twitter.com/deathgreps/status/632006221814464512
https://twitter.com/benniemosher/status/633768429313372160
See merge request !1923
2015-08-19 10:27:03 +00:00
72a425fa66
Merge branch 'remove-satellites'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02:00
a3e1d7cf93
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-19 09:47:33 +02:00
e56fd693ee
Merge pull request #9567 from bigsurge/bigsurge-patch-1
...
add CommitNote field expose :created_at
2015-08-19 00:23:17 -07:00
51e64356d7
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-19 09:01:46 +02:00
7f19d55c7c
Time for 8.0.0.pre
2015-08-19 09:01:22 +02:00
cecc18616a
add CommitNote field expose :created_at
...
add CommitNote field expose :created_at
2015-08-19 14:29:18 +08:00
a1bd164e72
Merge branch 'wip-blog-post' into 'master'
...
Make sure blog post MR has WIP keyword
cc @sytses @rspeicher
See merge request !1172
2015-08-18 23:38:42 +00:00
b04914ab46
added note about backing up recovery codes
2015-08-18 15:56:38 -07:00
91fa82d11f
Merge branch 'rs-help-path-traversal' into 'master'
...
Fix path traversal in HelpController
Closes #2543
See merge request !1922
2015-08-18 16:45:10 +00:00
a42c548a8d
Use File.join instead of Rails.root.join in HelpController
2015-08-18 09:08:03 -07:00
204914983a
Merge branch 'fix-authhash-infinite-loop' into 'master'
...
Fix infinite loop when SAML was incorrectly configured.
See merge request !1170
2015-08-18 15:56:30 +00:00
04e1c4d3da
Merge branch 'fix-rake-info' into 'master'
...
Fix gitlab:env:info rake task.
Found doing QA.
See merge request !1169
2015-08-18 15:47:38 +00:00
89beb39fcc
Make sure blog post MR has WIP keyword
2015-08-18 14:46:01 +00:00
2b127c3fd2
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-18 06:46:44 -07:00
798f2fe19f
Merge branch 'mr-source-branch-clear-cache' into 'master'
...
Clear cache to prevent listing deleted branches after MR removes source branch
Closes #2272
See merge request !1160
2015-08-18 13:16:46 +00:00
cc871c0c74
Merge pull request #9564 from bbodenmiller/robots.txt
...
disallow irrelevant pages by defaults in robots
2015-08-18 03:43:39 -07:00
adebf70220
Merge pull request #9436 from bbodenmiller/patch-4
...
capitalize URL in "Home page URL"
2015-08-18 03:43:22 -07:00
692e381e0c
capitalize URL in "Home page URL"
2015-08-17 23:16:18 -07:00
595a93ee2c
disallow irrelevant pages by default in robots
...
Update default robots.txt rules to disallow irrelevant pages that search
engines should not care about. This will still allow important pages
like the files, commit details, merge requests, issues, comments, etc.
to be crawled.
2015-08-17 23:11:16 -07:00
2a704396fb
Fix incorrect CHANGELOG version
2015-08-17 19:29:06 -07:00
5fad0b585e
Merge branch 'bump-gitlab-git' into 'master'
...
Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules
Closes #2262
See merge request !1171
2015-08-18 00:48:49 +00:00
47d55306d9
Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules
...
Closes #2262
2015-08-17 23:56:02 +00:00
262c6f11fe
Merge branch 'rs-remove-gfm_with_options' into 'master'
...
Remove the `gfm_with_options` helper
It was redundant because `gfm` also took options.
See merge request !1152
2015-08-17 23:42:29 +00:00
c16b1651f5
Fix infinite loop when SAML was incorrectly configured.
2015-08-17 16:39:22 -07:00
c9920c422d
Merge branch 'fix-backslashes-inline-diff' into 'master'
...
Fix bug where backslashes in inline diffs could be dropped
This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input:
```
input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip
```
The second backslash is dropped in the second `sub` statement:
With this fix, it looks like:
Closes #2253
See merge request !1143
2015-08-17 23:33:36 +00:00
f4cb6e438a
Merge branch 'code-import-error-ui-improvements' into 'master'
...
Improve error message display when project fails to import
Follow-up to !1134 .
New screenshot:
See merge request !1138
2015-08-17 23:31:51 +00:00
1e73e5dc14
Merge pull request #9565 from gitlabhq/revert-9528-Fixed_alignment_issue
...
Revert "Fix for #9527"
2015-08-17 18:30:21 +02:00
50696ce1d3
Revert "Fix for #9527"
2015-08-17 18:29:54 +02:00
478514b35b
Merge branch 'installation-update-guides' into 'master'
...
Installation and update guides for 7.14
cc @rspeicher
See merge request !1168
2015-08-17 16:01:40 +00:00
5d862509c3
Create update guides for 7.14
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 17:18:09 +02:00
dcd3396337
Update installation guide with 7.14
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 17:13:33 +02:00
02532d5873
Fix gitlab:env:info rake task.
2015-08-17 12:41:47 +02:00
4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
bbe0e58aeb
Merge branch 'pre-receive-wo-satellites' into 'remove-satellites'
...
Add support of pre-receive hooks without satellites
Implement commit transaction with pre-receive and post-receive hooks for web editor and merge
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1154
2015-08-17 09:18:43 +00:00
e02cff19ed
Fix typo in text when raise pre-receive exception
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 10:47:29 +02:00
3b93856e13
save repo empty state into variable for proper result
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 10:24:25 +02:00
9f7c7c857b
Merge branch 'rs-check-ruby-version' into 'master'
...
Require Ruby 2.1.0 in `gitlab:app:check` task
See merge request !1165
2015-08-16 00:06:36 +00:00
33c818d2d8
Require Ruby 2.1.0 in `gitlab:app:check` task
...
[ci skip]
2015-08-15 20:04:52 -04:00
18cbf07f8a
Merge branch 'changelog-1124' into 'master'
...
Update changelog for MR !1124
@dzaporozhets
See merge request !1164
2015-08-15 22:06:19 +00:00
18e9b01059
Update changelog for MR !1124
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-08-15 23:11:04 +02:00
0b5dc5cd52
Merge branch 'rs-gem-security' into 'master'
...
Bump omniauth-saml to 1.4.1
Updates a vulnerable `ruby-saml` dependency.
- 9853651b96https://github.com/onelogin/ruby-saml/pull/247
See merge request !1162
2015-08-15 03:30:15 +00:00
Stan Hu
Sytse Sijbrandij
Patricio Cano
Douwe Maan
Artem Sidorenko
Job van der Voort
Dmitriy Zaporozhets
Robert Schilling
bigsurge
karen Carias
Douwe Maan
Robert Speicher
Robert Speicher
Ben Bodenmiller
Sven Strickroth
