72a425fa66
Merge branch 'remove-satellites'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02: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
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
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
4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
6e808fc222
Clear cache to prevent listing deleted branches after MR removes source branch
...
Closes #2272
2015-08-14 07:09:25 -07:00
013260e057
markup_helper: detect .mkd and .mkdn as markdown
2015-08-12 15:29:15 -04:00
c36adb98aa
Fix bug where backslashes in inline diffs could be dropped
...
Closes #2253
2015-08-11 18:39:27 -07:00
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02: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
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
fb6dc1f07d
Add `Group#add_*` convenience methods
...
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-07 00:20:02 -04:00
863f61343a
Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'
...
Fix errors deleting, creating, and viewing graphs using branches with encoded slashes
* Closes #1804
* Closes #1359
See merge request !1084
2015-08-06 08:29:18 +00:00
957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
6353ca9ae8
Revert "Update noteable after a new note is added"
...
This reverts commit fbdaf0e2a5
2015-08-05 12:00:12 +03:00
44ac823e59
Improve tests to use real branches in merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 17:20:26 +02:00
b48b07044b
Merge branch 'master' into drop-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
ecbe119af1
Fix "Network" and "Graphs" pages for branches with encoded slashes
...
Closes #1359
2015-08-02 00:07:23 -07:00
4e22dcb6a3
Add spec to RelativeLinkFilter for Unicode filenames
2015-07-30 17:25:07 -04:00
5eeab9f0a6
GoogleCode importer: Do not care about casing of image file extensions
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-07-20 00:53:43 +02:00
a87989fb7d
Remove satellites
2015-07-15 15:45:57 +02:00
9add3e6eb5
Extract the longest-matching ref from a commit path when multiple matches occur
...
Closes #1839
2015-07-01 07:01:59 -07:00
f40b99d02e
Merge branch 'master' into rubocop-for-tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
spec/features/issues_spec.rb
spec/models/forked_project_link_spec.rb
spec/models/hooks/service_hook_spec.rb
spec/models/hooks/web_hook_spec.rb
spec/models/project_services/hipchat_service_spec.rb
spec/requests/api/project_members_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/api/system_hooks_spec.rb
spec/services/archive_repository_service_spec.rb
spec/support/matchers.rb
spec/tasks/gitlab/backup_rake_spec.rb
2015-06-23 10:44:03 +02:00
52aa21b12d
Fix Style/IndentationWidth cop violations
2015-06-22 22:25:40 -07:00
3446bea719
Fix Style/CaseIndentation cop violations
2015-06-22 22:25:21 -07:00
359ed48638
Fix Style/AlignHash cop violations
2015-06-22 22:24:39 -07:00
15a05be70d
Fix Style/Blocks cop violations
2015-06-22 16:00:54 -04:00
94eff65569
Fix Style/SpaceInsideHashLiteralBraces cop violations
...
These fixes were performed automatically by Rubocop's `-a` flag.
2015-06-22 14:41:00 -04:00
56246b70fb
Fix Style/TrailingBlankLines cop violations
2015-06-22 14:38:33 -04:00
649c9969ba
Fix Style/IndentationConsistency cop violations
2015-06-22 14:33:01 -04:00
cf259cdb43
Remove unnecessary whitespace between let and (
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 14:39:07 +02:00
e4e01dbf41
Fix Gitlab::OAuth::User spec
2015-06-22 12:13:49 +02:00
bf71d53f63
Change `to_not` calls to `not_to`
...
Both work, but now we're consistent across the entire app.
2015-06-22 12:13:49 +02:00
0f627f1c60
Fix `raise_error` without an argument deprecation warnings
2015-06-22 12:13:47 +02:00
5a9ede4721
Update mock and stub syntax for specs
2015-06-22 12:13:46 +02:00
62079d7654
Add init test for ProjectSearchResults
...
See: https://github.com/gitlabhq/gitlabhq/pull/9368#issuecomment-110350335
2015-06-18 10:35:48 -07:00
d96d9aae42
Fix behavior of ldap_person method in Gitlab::OAuth::User
...
Code tweaks in 45e9150a
2015-06-17 18:06:27 +02:00
7300729190
Merge branch 'rs-dev-issue-2228' into 'master'
...
Allow user to customize default Dashboard page
Renames the "Design" profile page to "Preferences" and adds a field to customize the default Dashboard page:
> 
See merge request !778
2015-06-15 11:29:36 +00:00
5c6d83b8e7
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-06-14 12:46:22 +02:00
b645f0f432
Merge pull request #9340 from jvanbaarsen/update-noteable
...
Update noteable after a new note is added
2015-06-14 12:46:07 +02:00
422236c71e
Change `foo.should` syntax to `expect(foo).to` in specs
2015-06-13 18:37:30 -04:00
75a40ad5bc
Change `foo.should_not` syntax to `expect(foo).not_to` in specs
2015-06-13 18:19:24 -04:00
844d72716e
Add Gitlab::Themes module; remove Gitlab::Theme
...
Now we can simply loop through all themes, among other things.
This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
2015-06-13 17:58:16 -04:00
fbdaf0e2a5
Update noteable after a new note is added
...
**What does this do?**
It makes sure that whenever a new note is added to an noteable item, the
updated_at of that item is also updated.
**Why is this needed?**
At this moment when you post a comment on an issue or add a label to an issue,
the updated_at is not changed. Because of this the filtering for least recently
updated is not really useful (since it only takes in account the original text
from the noteable).
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-06-05 15:22:55 +02:00
3f59a8f0be
Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'
2015-06-05 13:34:25 +02:00
bedc66eb04
Merge branch 'rs-remove-guard' into 'master'
...
Remove Guard
None of the GitLab B.V. developers were using it.
See internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2360
See merge request !764
2015-06-04 17:54:33 +00:00
9287865599
Merge branch 'fix-upgrader-script' into 'master'
...
Fix upgrader script
This is a fix for upgrader script not guessing the latest version correctly.
Upgrader now handles versions where a version part (major/minor/patch) can have multi-digit number, also ensures that the latest version is chosen from git tags by converting tag to Gitlab::VersionInfo and than selecting the latest/greatest version.
Fixes : #1476
See merge request !695
2015-06-04 16:01:13 +00:00
65be969b78
Remove unnecessary require from RepositoryCache spec
2015-06-04 11:40:43 -04:00
Dmitriy Zaporozhets
Robert Speicher
Douwe Maan
Stan Hu
Ben Boeckel
Robert Speicher
Valery Sizov
Sven Strickroth
Alex Lossent
Jeroen van Baarsen
