Commit Graph
3478 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2388fdd7c6 Improve fork to namespaces feature
* Show namespace thumbnail differently if project was already forked
* Show loading spinner when click on fork
* Fork link navigates to personal namespace only if no manageable groups exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-14 16:06:39 +02:00
Dmitriy Zaporozhets e08e405ac4 Select namespace where to fork project
Now you can fork project into group or personal namespace.
Also I moved fork logic from ProjectsController to own fork resource

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-13 22:06:19 +02:00
Dmitriy Zaporozhets 6adc313a1f Merge branch 'actions_in_the_inbox' into 'master'
Actions in the inbox

Related to #1607

See merge request !1247
2014-11-12 14:57:38 +00:00
Dmitriy Zaporozhets c58edd7c70 Merge branch 'add_issue_edited_timestamp' into 'master'
Add issue edited timestamp

Comments already have this feature.
So, I think, issues should also have it.
![Снимок экрана 2014-11-08 в 17.07.10](https://gitlab.com/uploads/vernik91/gitlab-ce/4e87a15130/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA_%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0_2014-11-08_%D0%B2_17.07.10.png)

See merge request !235
2014-11-12 11:02:25 +00:00
Marin Jankovski 857852ce04 Set action on issue/mr creation mail. 2014-11-12 11:59:57 +01:00
Dmitriy Zaporozhets a6f48aedc3 Merge pull request #7944 from cirosantilli/new-blob-commit-below
Move new blob commit message textarea below editor
2014-11-11 17:22:51 +02:00
Marin Jankovski 3dcb5f8501 Include the helper for mailer, add links to emails. 2014-11-11 16:10:24 +01:00
Dmitriy Zaporozhets 72922cfa27 Merge branch 'remove_unused_javascript' into 'master'
Remove unused javascript

projects:teams:members:index doesn't exists

See merge request !234
2014-11-10 19:45:15 +00:00
Dmitriy Zaporozhets 5ef196621e Merge branch 'better-mr-instructions' into 'master'
Better merge request manual instructions

I noticed the current instructions for manually merging a merge request that was submitted from a fork could create unnecessary merge requests or strange history. Imagine this:

1. Alice creates a repository and commits / pushes a single commit with SHA1 `A` to `master`.
2. Bob forks this repository and creates a new branch `myfeature` on `master` (`A`)
3. Alice commits `B` to `master` (which has the parent `A`)
4. Bob creates two commits on `myfeature` `P` and `Q`.
5. Bob submits the merge request to merge his `myfeature` into Alice's `master` branch.
6. Alice follows the manual merge request instructions:
  1. `git checkout -b bob/repo-myfeature master`
  2. `git pull http://... myfeature`

The branch `bob/repo-myfeature` was created from Alice's current `master`, which was `B`. When the `pull` is executed, git will fetch Bob's branch and then merged the fetched branch `Q` into the current branch's location `B`. This creates an unnecessary merge commit from `master` into the branch Alice is trying to merge. No harm is done, but the history is a bit messier.

This is even worse if Alice has set `git pull` to rebase by default. In this case, the commit `B` is rebased on top of `Q`. When Alice checks out `master` and merges in the branch, there will actually be a duplicate `B` commit.

These new instructions instead tell the user to fetch Bob's `myfeature` branch. This will fetch the necessary commits `P` and `Q` and create a temporary ref `FETCH_HEAD` pointing to `Q`. Alice will then create her local `bob/repo-myfeature` branch starting at `FETCH_HEAD`. No unnecessary merge commits, and no accidental rebasing.

See merge request !16
2014-11-10 19:39:25 +00:00
Nikita Verkhovin 2148e1997a Add issue edited timestamp 2014-11-08 16:54:08 +06:00
Dmitriy Zaporozhets 6cac4e6271 Fix attachment misaligned in comment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-07 12:51:18 +02:00
skv 9353db59a0 remove unused js 2014-11-06 22:34:41 +03:00
Valeriy Sizov f84772875e Merge pull request #7863 from cirosantilli/rm-blob-link-to-button
Transform remove blob link into button.
2014-11-05 14:09:32 +02:00
Valeriy Sizov 81613f965f Merge pull request #7848 from bbodenmiller/patch-1
improve SSH key emails
2014-11-05 14:06:14 +02:00
Dmitriy Zaporozhets f0dd16d53e Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-10-30 16:17:36 +02:00
Sean Edge 822d9aa6ba Create RepoTag Grape entity and present it when doing stuff with tags via API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags. 2014-10-30 09:48:23 -04:00
Dmitriy Zaporozhets e1299bab7b Merge branch 'feature_password_strength_indicator' into 'master'
Add a password strength indicator to SIGN UP and PROFILE pages

Fixes #1647

Added a password strength indicator to the sign up page. You can see how it looks in the following screenshot. In the sign up page, it checks if the password contains the username and alerts the user about it. If the user still wants to proceed with creating his account, nothing will stop him. This is merely a message. The indicator changes the input background color based on the strength like this:

![new_full](https://dev.gitlab.org/uploads/gitlab/gitlabhq/0e6da27cfe/new_full.png)

The password strength indicator can also be found in the profile edit page. It functions in almost the exact same way, with the exception that it doesn't check if the password contains the username.

![edit_full](https://dev.gitlab.org/uploads/gitlab/gitlabhq/f73001539e/edit_full.png)

There are tests included.

/cc @job

See merge request !1227
2014-10-30 11:32:11 +00:00
Dmitriy Zaporozhets ff6b352610 Merge branch 'project_name_and_path_rename' into 'master'
Project name and path rename in the same section

Fixes #1577

See merge request !1223
2014-10-30 11:19:33 +00:00
Dmitriy Zaporozhets 905004fdc3 Merge pull request #7980 from mr-vinn/diff-renames
Display renamed files in diff views
2014-10-29 19:09:33 +02:00
Patricio Cano bf07fcf06a Removed unnecessary role in form. 2014-10-28 11:04:46 -05:00
Patricio Cano 9397d19380 Added ID to the form-group, to fix alignment of inputs 2014-10-28 11:02:36 -05:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag
Use button type=submit instead of input.
2014-10-28 12:11:15 +02:00
Marin Jankovski 50ee0b81b8 Leave the project name field editable, fix the test. 2014-10-28 09:19:58 +01:00
Ben Bodenmiller 56ffa0fba4 improve ssh key emails 2014-10-28 00:06:22 -07:00
Dmitriy Zaporozhets 367d4db4cd Merge pull request #8155 from cirosantilli/unassigned
Show nothing instead of unassigned on issues
2014-10-27 19:21:26 +02:00
Dmitriy Zaporozhets f4178f9601 Merge pull request #8005 from cirosantilli/settings-to-gitlab-config
Use Gitlab.config instead of Settings everywhere
2014-10-27 19:18:48 +02:00
Marin Jankovski d08bb4b3a4 Add project name to rename repository section 2014-10-27 16:08:11 +01:00
Patricio Cano 000af8d5d7 Moved require from application.js to password_strength.js
Corrected div id for profile password/edit
Added first spinach tests
2014-10-24 17:19:35 -05:00
Ciro Santilli e4912243c1 Transform remove blob link into button. 2014-10-24 23:44:30 +02:00
Patricio Cano 7fbc4f5b3a Corrected the layout of the strength indicator to be more consistent throughout the application.
Fixed a test that was looking for an outdated HTML ID
2014-10-23 17:49:48 -05:00
Ciro Santilli 2c14f9c41f Show nothing instead of unassigned on issues 2014-10-23 16:25:09 +02:00
Robert Schilling e6e5e63c29 Merge pull request #8118 from cirosantilli/user-groups-space-link
Remove whitespace link between user group avatars
2014-10-23 12:06:01 +02:00
Patricio Cano 7039c9868a Updated the IDs of the fields, so that it wouldn't mess with many tests
Updated some tests to match new IDs
2014-10-22 20:39:02 -05:00
Patricio Cano 10528341c2 Merge branch 'master' into feature_password_strength_indicator 2014-10-22 12:44:23 -05:00
Patricio Cano 91c96b3714 Added a password strength indicator
to the reset password view and the change password view after first login.
Updated JS to work with the updated views.
2014-10-22 12:40:41 -05:00
Dmitriy Zaporozhets 18ba6987cd Merge branch 'fix_milestone_link' into 'master'
Fix milestone link in issue page. Closes #174

For a complete description see #174.

See merge request !196
2014-10-22 14:15:33 +00:00
Dmitriy Zaporozhets b0ef23c193 Fix 500 error on login page if ldap enabled and sign-in disabled
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-22 13:38:47 +03:00
Ciro Santilli 0e70e3b557 Remove whitespace link between user group avatars 2014-10-21 20:19:07 +02:00
Dmitriy Zaporozhets ee068e76f3 Merge pull request #7961 from cirosantilli/dry-log-file-names
Factor admin logs [failure unrelated]
2014-10-21 11:59:41 +03:00
Dmitriy Zaporozhets fb5c1dd8f0 Merge pull request #8113 from cirosantilli/factor-group-forms
Factor group forms
2014-10-21 11:39:41 +03:00
Robert Schilling 11656fd423 Merge pull request #8111 from cirosantilli/dry-group-avatar-button
Factor choose group avatar button
2014-10-21 08:25:09 +02:00
Ciro Santilli 3a47ed979a Factor group forms 2014-10-21 00:25:44 +02:00
Ciro Santilli 01db264ffc Factor choose group avatar button 2014-10-20 23:57:46 +02:00
Ciro Santilli f7d01f2067 Factor group tips 2014-10-20 23:43:51 +02:00
Dmitriy Zaporozhets 2064a14724 Add tests for remove group member feature in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-20 13:18:07 +03:00
Dmitriy Zaporozhets f50c0e5af1 Fix group user removal from admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-20 12:59:16 +03:00
Sytse Sijbrandij 6cff68fb30 Link to trending public projects so more relevant projects are shown to new users. 2014-10-17 16:27:44 +02:00
Ciro Santilli 39c66c822e Use Gitlab.config instead of Settings everywhere 2014-10-15 23:01:31 +02:00
Dmitriy Zaporozhets c926922ade Show merge in progress message if MR is locked
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-15 15:52:39 +03:00