Commit Graph
22224 Commits
Author SHA1 Message Date
Sytse Sijbrandij 01cd7d2c2a Improve instructions for publishing gitlab-app. 2015-06-05 14:15:15 +00:00
Dmitriy Zaporozhets 5a026152b7 Merge branch 'warn-about-referenced-users' into 'master'
Show warning when a comment will add 10 or more people to the discussion.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2054

New issue:

![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png)

New comment:

![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png)

See merge request !754
2015-06-05 13:37:08 +00:00
Dmitriy Zaporozhets 6f7bf4e4f0 Merge branch 'wip-mr-docs' into 'master'
Add info about WIP merge requests to docs.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2078.

See merge request !770
2015-06-05 13:35:16 +00:00
Dmitriy Zaporozhets 3b9792ec72 Merge branch 'fix-long-blob-timeout' into 'master'
Fix timeout when rendering file with thousands of lines.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2354.

See merge request !771
2015-06-05 13:34:16 +00:00
Jeroen van Baarsen 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
rugk 507ebb701a Escaped(?) 2015-06-05 13:18:05 +00:00
rugk 193f019f61 Added free alternative to Google Authenticator (FreeOTP). 2015-06-05 13:16:47 +00:00
Job van der Voort ef7c0945c3 Merge branch 'understanding-unicorn' into 'master'
Try to explain Unicorn and unicorn-worker-killer

See merge request !1842
2015-06-05 13:12:32 +00:00
Dmitriy Zaporozhets dfccb06dda Refactor web editor
* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-05 15:01:38 +02:00
Douwe Maan 44458f3ca2 Add "Remember me" checkbox to LDAP signin form. 2015-06-05 14:37:01 +02:00
Jacob Vosmaer d98bcb9ca9 Try to explain Unicorn and unicorn-worker-killer 2015-06-05 14:23:35 +02:00
Douwe Maan 9a50db693a Fix timeout when rendering file with thousands of lines. 2015-06-05 13:56:37 +02:00
Douwe Maan 3f59a8f0be Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth' 2015-06-05 13:34:25 +02:00
Douwe Maan bdfd163aa1 Add info about WIP merge requests to docs. 2015-06-05 13:12:55 +02:00
Dmitriy Zaporozhets 214f38c422 Merge branch 'fix-empty-navbar' into 'master'
Fix empty header margin

See merge request !769
2015-06-05 10:47:13 +00:00
Douwe Maan 45e9150a51 Tweak code. 2015-06-05 12:32:01 +02:00
Douwe Maan 5256b5cc06 Prefer jQuery on to bind, and don't use .js class. 2015-06-05 12:13:02 +02:00
Dmitriy Zaporozhets 8d2996fe0e Fix empty header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-05 12:08:43 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00
Douwe Maan 1f78aeba40 Merge branch 'improve_bitbucket_docs' into 'master'
Improve BitBucket integration documentation [ci skip]

This MR will improve the BitBucket integration documentation by

- mentioning the need to reconfigure GitLab after changing the configuration file, if you're using the omnibus package.
- adding a section about configuring a Host entry for bitbucket.org.
- switching additional steps 1 and 2, because connecting to BitBucket will only work after you added the SSH key and the Host entry.
- using sudo for the ssh connection in step 2, so that it is more obvious, that the git account should be used to establish the connection.

See merge request !670
2015-06-05 10:05:09 +00:00
Dmitriy Zaporozhets 22d5d8913b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 10:38:44 +02:00
Dmitriy Zaporozhets b7d20f14c6 Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master'
Order commit comments in API chronologically

When fetching commit comments via API, the comments were not ordered,
but just returned in the order Postgresql finds them. Now the API always
returns comments in chronological order.

Same as !628 but with CI

See merge request !768
2015-06-05 08:38:19 +00:00
Dmitriy Zaporozhets 1498de225c Merge branch 'ci_script_simplify1' into 'master'
CI script: remove directives with default value

See merge request !1841
2015-06-05 07:42:31 +00:00
Valery SizovandValery Sizov 64b6dbea74 CI script: remove directives with default value 2015-06-04 23:06:37 +03:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 32ba92a7e2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-04 18:03:53 +02:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 8b089fa27e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-04 18:00:10 +02:00
Dmitriy Zaporozhets b9219469f7 Merge branch 'make-namespaces-api-available-to-all-users' into 'master'
Make namespace API available to all users

### What does this MR do?

This MR makes it possible for a user to query namespaces to which he/she has access. Also, it adds documentation for the existing API.

### Why was this MR needed?

Even though the `groups` API exists, it might still be useful to have an endpoint that tells the namespace type (e.g. `user` vs. `group`), especially if a user has access to a number of different projects.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9328

See merge request !708
2015-06-04 15:59:17 +00:00
Dmitriy Zaporozhets 1d945945bb Merge branch 'sn-push-email-plussign' into 'master'
Use entity number for plus sign in push emails

Was doing some testing today and found that both outlook and gmail had issues displaying the html content produced for push emails when a file was added.

This is how gmail shows it:
![Gmail_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/24be115dbae97997bc02e2ec70d9870c/Gmail_name.png)

And this is for Outlook:
![Outlook_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/4b5a54956139d36d78f9c61c83e99928/Outlook_name.png)

iOS devices work with the &plus; entity, as does Mail on OS X, but I'm wondering if it is only available for newer html parsers (a quick browse on the w3c site seems to show that it was added in html 5).

Changing the entity to `&#43;` and both gmail and outlook and iOS and Mail.

See merge request !721
2015-06-04 15:57:53 +00:00
Dmitriy Zaporozhets ef3e0931b9 Merge branch 'fix-no-labels-page' into 'master'
Omit link to generate labels if user does not have access to create them

On a project that has no labels, a user was provided a link to create labels on the "Labels" tab, resulting in a 404. This MR changes the next to "No labels created" if the user lands on this page but does not have permission to add a label.

Screenshot:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/cb04659cf3a0abe1e072cb78d0964b94/image.png)

Closes https://github.com/gitlabhq/gitlabhq/issues/8353

See merge request !752
2015-06-04 15:56:13 +00:00
Robert Speicher 44396e44a3 Remove unnecessary require from Spinach env 2015-06-04 11:47:00 -04:00
Robert Speicher 65be969b78 Remove unnecessary require from RepositoryCache spec 2015-06-04 11:40:43 -04:00
Dmitriy Zaporozhets 8645a0d39e Merge branch 'refacor-ci-script' into 'master'
Refactor CI script

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @valery

See merge request !1840
2015-06-04 15:36:49 +00:00
Dmitriy Zaporozhets b18ac382b7 Refactor CI script
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-04 16:54:32 +02:00
Dmitriy Zaporozhets 7f042e8bcb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-04 16:46:51 +02:00
Dmitriy Zaporozhets e063c8f3e2 Merge branch 'trigger_hooks_create_on_backup_restore' into 'master'
Trigger hooks create on backup restore

Number of users migrating from installation from source to omnibus get this issue. This can be fixed with a bash one liner but we already have a script that creates hooks in gitlab-shell. Added to gitlab:shell:install task call to `bin/create-hooks`. This script is idempotent which means it will only rewrite hooks if something changed.

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2208, https://github.com/gitlabhq/gitlabhq/issues/9101 and for the most part https://github.com/gitlabhq/gitlabhq/issues/8161

See merge request !762
2015-06-04 14:46:24 +00:00
Dmitriy Zaporozhets d204c8f862 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-04 16:42:16 +02:00
Dmitriy Zaporozhets 28b6cde345 Merge branch 'add_ci_yaml' into 'master'
Added autogenerated .gitlab-ci.yml

See merge request !1839
2015-06-04 14:40:21 +00:00
Valery Sizov 3d5a51d416 added ci yaml 2015-06-04 13:47:44 +03:00
Dmitriy Zaporozhets 971e57cffa Merge branch 'rs-issue-1741' into 'master'
Remove show actions from Admin and Project DeployKeys

Example styling after:

> ![Screen_Shot_2015-06-03_at_6.04.51_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/105801a7e390224066721bba200c4909/Screen_Shot_2015-06-03_at_6.04.51_PM.png)

Closes #1741

See merge request !763
2015-06-04 08:34:25 +00:00
Robert Speicher 682d4b6a86 Remove Guard
None of the GitLab B.V. developers were using it.
2015-06-03 20:45:53 -04:00
Robert Speicher 793d9799b6 Show key fingerprint on DeployKeys#index
Also style all key fingerprints consistently across the app.
2015-06-03 18:03:04 -04:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04:00
Marin Jankovski 7af2fbbaf6 Add a changelog item. 2015-06-03 17:08:37 +02:00
Job van der Voort 83e59db55e Merge branch 'rs-2fa-docs' into 'master'
Add 2FA docs

See merge request !757
2015-06-03 15:05:54 +00:00
Dmitriy Zaporozhets fb59f04fdf Merge branch 'fix-group-remove' into 'master'
Group improvements

* remove projects before removing group
* execute all hooks/events from project destroy when group removed
* log group create/remove
* delay remove of namespace directory (to prevent NFS issues)

Inspired by !759

See merge request !761
2015-06-03 15:02:33 +00:00
Dmitriy Zaporozhets 55715735d1 Add CHANGELOG item
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03 17:01:31 +02:00
Dmitriy Zaporozhets 8046b69761 Merge branch 'remove_unecessary_rake_task' into 'master'
Remove gitlab:env:check task.

Rake task that checks for git user git settings is a leftover from early days.

It is not being used by the web editor(and web editor is also being redone atm) so this rake task just causes confusion.

Adresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2362

See merge request !758
2015-06-03 14:59:38 +00:00
Marin Jankovski a1be236c87 Trigger hooks-create on gitlab backup restore. 2015-06-03 16:24:37 +02:00