Commit Graph
14812 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets dffa2fa9e9 Use sass variabled for backgroung and border colors 2015-03-13 23:40:46 -07:00
Dmitriy Zaporozhets 2da2720584 Improve css for file actions 2015-03-13 19:20:25 -07:00
Marin Jankovski 3aded9d581 Update changelog with change to unicorn workers number recommendation. 2015-03-13 17:47:30 -07:00
Marin Jankovski 06439fd784 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-13 17:16:28 -07:00
Marin Jankovski 2d3a0f6d63 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-13 17:14:52 -07:00
Marin Jankovski 141168ad3c Change default number of unicorn workers to three. 2015-03-13 17:14:34 -07:00
Dmitriy Zaporozhets afb694886e Merge branch 'ldap-unblock-user' into 'master'
Unblock user if they were unblocked in AD.

Fixes problem with !1687.

See merge request !1694
2015-03-13 22:25:47 +00:00
Robert Schilling 42be733d41 Merge pull request #8954 from pupaxxo/patch-2
Fix typo in CHANGELOG.md
2015-03-13 22:40:16 +01:00
Douwe Maan 8fed435208 Unblock user if they were unblocked in AD. 2015-03-13 22:34:11 +01:00
Douwe Maan 42e97d2891 Merge branch 'fix_tests' into 'master'
Fix failing tests

Revert the last merge, as it breaks the master and I didn't see that this line is used in hooks as well when I merged this.

See merge request !390
2015-03-13 21:22:13 +00:00
Hannes Rosenögger 2172d7ff9e Revert "Merge branch 'follow-on-mr376' into 'master'"
This reverts commit 07f9a3f928, reversing
changes made to 4803675190.

Reverted this because the data is used in hooks as well.
2015-03-13 22:17:51 +01:00
Andrea Ruggiero a1b3e239ee Fix typo in CHANGELOG.md 2015-03-13 21:27:05 +01:00
Hannes Rosenögger 07f9a3f928 Merge branch 'follow-on-mr376' into 'master'
Follow on to MR 376

Follow-on to MR 376 from @haynes . Remove unnecessary fetch of commit messages for initial push. This will reduce the memory usage significantly.

See merge request !387
2015-03-13 19:16:42 +00:00
Dmitriy Zaporozhets 4803675190 Merge branch 'bump-gitlab-git' into 'master'
Bump gitlab_git to 7.1.1

Verify found object is actually a commit in Commit.find.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1204

See merge request !1696
2015-03-13 17:34:44 +00:00
Dmitriy Zaporozhets 309f588d56 Merge branch 'fix-encoding' into 'master'
Minor cleanup around UTF-8 encoding.

Minor cleanup to be merged after https://dev.gitlab.org/gitlab/gitlab_git/merge_requests/24 is merged in.

See merge request !1642
2015-03-13 16:50:53 +00:00
Dmitriy Zaporozhets b09e8c771c Bump gitlab_git to 7.1.1
Verify found object is actually a commit in Commit.find
2015-03-13 09:47:50 -07:00
Dmitriy Zaporozhets b8f5e23f27 Merge branch 'tag-branch-hooks' into 'master'
Execute hooks and services when branch or tag is created or deleted through web interface.

Fixes #2095.

Split up into commits to make it easier to see why what was changed :)

See merge request !1692
2015-03-13 16:42:01 +00:00
Dmitriy Zaporozhets d37d7ffc1b Merge branch 'ldap-form' into 'master'
Use custom LDAP label in LDAP signin form.

Addresses https://dev.gitlab.org/gitlab/gitlab-ee/issues/238

![Screen_Shot_2015-03-13_at_15.43.19](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e9f0d1ed7238701ecdbaa54d4f538d89/Screen_Shot_2015-03-13_at_15.43.19.png)

See merge request !1693
2015-03-13 16:36:08 +00:00
Elliot 9bb5986d4a Remove unnecessary fetch of commit messages for initial push. This will reduce the memory usage significantly. 2015-03-13 09:27:10 -07:00
Dmitriy Zaporozhets 823e5457d0 Merge branch 'import-options-dup' into 'master'
Fix import pages not working after first load.

Fixes #2102.

`OAuth2::Client` was deleting keys from the options hash in place, which made it incomplete the next time the import page was loaded. We dup it so this no longer happens.

See merge request !1691
2015-03-13 15:35:40 +00:00
Robert Schilling 2b0f9f9375 Merge branch 'update-webhooks-docs' into 'master'
Update Webhook documentation for tag and tag push events

Just a quick update to include the `object_kind` field in the Webhooks documentation.

See merge request !389
2015-03-13 15:12:50 +00:00
Douwe Maan b160db1482 Add changelog item. 2015-03-13 16:07:12 +01:00
Douwe Maan 12b779e70b Move tag deletion to service and execute hooks and services. 2015-03-13 16:07:08 +01:00
Douwe Maan 10421674af Ecevute hooks and services when branches are created/deleted through web. 2015-03-13 16:07:02 +01:00
Douwe Maan f2024b1e06 More consistent method naming. 2015-03-13 16:07:02 +01:00
Douwe Maan 84d28209b6 Use PushDataBuilder where applicable. 2015-03-13 16:06:56 +01:00
Stan Hu affb5b3ff4 Update documentation for object_kind field in Webhook push and tag push Webhooks 2015-03-13 07:48:35 -07:00
Douwe Maan 09791774a5 Use custom LDAP label in LDAP signin form. 2015-03-13 15:42:31 +01:00
Douwe Maan 4e49f21b14 Set push data object kind in PushDataBuilder. 2015-03-13 14:51:48 +01:00
Douwe Maan 7f4cffd88b Reuse blob object fetched by Gitlab::Git::Blame. 2015-03-13 13:49:27 +01:00
Douwe Maan f96dc6295a Everything from gitlab_git is already UTF-8. 2015-03-13 13:49:27 +01:00
Douwe Maan 2718955441 Fix import pages not working after first load. 2015-03-13 13:47:26 +01:00
Hannes Rosenögger 12f1a42ecc Merge branch 'enhance_markdown_linebreak_docs' into 'master'
Enhance Markdown linebreak docs

The "Line Breaks" section within the Markdown docs was missing an example of creating a line break within a paragraph by ending a line with two spaces.

See merge request !335
2015-03-13 10:25:58 +00:00
Drew Blessing 606d24ff2d Merge branch 'irker-service-use-supported-events' into 'master'
Make Irker service check supported_events

63178a9509 added the supported_events check for services. Since f84b7eef3f was just added, we should adjust it accordingly.

See merge request !367
2015-03-13 00:41:07 +00:00
Dmitriy Zaporozhets c0579757d5 Merge branch 'mr-filter-by-title' into 'master'
Implement merge requests search

It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues

See merge request !1690
2015-03-13 00:38:54 +00:00
Dmitriy Zaporozhets ec02cdf205 Merge branch 'master' into mr-filter-by-title
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
2015-03-12 16:29:03 -07:00
Dmitriy Zaporozhets fdfa79a79e Merge branch 'default-pagination' into 'master'
Use same constant for amount of items per page

See merge request !1689
2015-03-12 23:23:15 +00:00
Dmitriy Zaporozhets 80b2f3fb86 Implement merge requests search
It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues
2015-03-12 16:20:58 -07:00
Dmitriy Zaporozhets f0cbbd70bb Use same constant for amount of items per page 2015-03-12 15:37:00 -07:00
Dmitriy Zaporozhets 2fe69158f0 Merge branch 'group-icon-performance' into 'master'
Prevent database query each time we render group avatar

Fixes #2118

See merge request !1688
2015-03-12 22:28:47 +00:00
Marin Jankovski 1c3997a747 Merge branch 'replace_passwords_with_asterisk' into 'master'
Show asterisks instead of password in service edit form.

See merge request !1686
2015-03-12 22:27:46 +00:00
Dmitriy Zaporozhets bf0c04e5ff Fix specs 2015-03-12 14:51:41 -07:00
Dmitriy Zaporozhets 7ac62388a5 Prevent database query each time we render group avatar 2015-03-12 13:56:53 -07:00
Dmitriy Zaporozhets cca08e146d Merge branch 'ldap-block-user' into 'master'
Block user if he/she was blocked in Active Directory

For gitlab/gitlab-ee#248

See merge request !1687
2015-03-12 20:36:35 +00:00
Dmitriy Zaporozhets e7f4f0ae1d Block user if he/she was blocked in Active Directory 2015-03-12 11:53:21 -07:00
Dmitriy Zaporozhets 0f144f36bc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-12 11:19:03 -07:00
Dmitriy Zaporozhets 12ba855ffd Merge branch 'improve-import-page' into 'master'
Style improvements to import page

See merge request !1685
2015-03-12 18:18:05 +00:00
Douwe Maan d66148ef39 Merge branch 'fix_email_images' into 'master'
Fix email images

## Dependencies:
This MR Depends on gitlab-org/html-pipeline-gitlab!4 being **merged and published** to rubygems.org

## What does this MR do?
This MR fixes the broken images in emails that occured scince we introduced access control for all attachments in 7.8.
The access control lead to broken images, because the user usually isn't logged into gitlab when opening the email in his mail client.
The solution to fix this, is to replace all images that were uploaded to gitlab as attachemnts with inline images in emails.

I only added one test for images in notes, because all notes share the same view. If it works fine for a note on a commit, then it'll also work the same for notes on a MR or on issues.

@DouweM can you review this please?

Closes #1161

See merge request !373
2015-03-12 17:40:17 +00:00
Dmitriy Zaporozhets cdb64a81a8 Add items into changelog 2015-03-12 10:20:24 -07:00
Dmitriy Zaporozhets 1065f3d30b Merge branch 'github-org-repos' into 'master'
Fix missing GitHub organisation repositories on import page.

Private repositories belonging to organizations rather than users can't be imported because `client.repos(org.login)` was requesting `/users/:org_login/repos` (which only returns public org repo's), while we need `/orgs/:org_login/repos` (which includes both public and private). The `client.org_repos` method does this.

cc @marin This is a bug in 7.8.x, but I'm not sure if it needs a minor release now or if it can go in 7.9.

See merge request !1683
2015-03-12 17:13:25 +00:00