Commit Graph
14456 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 229eb732f5 Merge branch 'project-refs-with-digit-prefix' into 'master'
Support referencing issues to a project whose name starts with a digit

Gitlab supports adding users or projects whose name starts with a "_" or a digit, but the regexp in markdown.rb enforces "a-zA-Z" for the first character.

This change allows to reference issues or merge requests in other projects whose name starts with a digit, like `owner/2ndtestproject#123` or `2nduser/superproject!123`.

See merge request !264
2015-03-02 22:51:42 +00:00
Dmitriy Zaporozhets c530ca00b0 Merge branch 'fix-protected-branches-routing' into 'master'
Fix protected branches routing

### Summary

On the master branch, if you attempt to access the protected branches in the project settings with an empty repo, you get `NoMethodError - undefined method "project_url"`.

### Steps to reproduce

1. Check out GitLab master and run.
2. Create a new project.
3. Go to Settings.
4. Click on "Protected branches"

### Expected behavior

The controller is supposed to redirect back to the projects page since there are no branches.

### Observed behavior

Internal Error 500

### Relevant logs

```
NoMethodError - undefined method `project_url' for #<Projects::ProtectedBranchesController:0x007fd920054af0>:
  app/controllers/application_controller.rb:157:in `method_missing'
  actionpack (4.1.9) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url'
  actionpack (4.1.9) lib/action_dispatch/routing/url_for.rb:161:in `url_for'
  actionpack (4.1.9) lib/action_controller/metal/redirecting.rb:91:in `_compute_redirect_to_location'
  turbolinks (2.0.0) lib/turbolinks.rb:15:in `_compute_redirect_to_location_with_xhr_referer'
  actionpack (4.1.9) lib/action_controller/metal/redirecting.rb:71:in `redirect_to
```

### Fix

I added a unit test for the empty project case and replicated the issue. I added the URL router helpers that appear to be necessary after 42387b733b.

See merge request !359
2015-03-02 22:39:28 +00:00
Dmitriy Zaporozhets ed3bd155fc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-02 13:45:46 -08:00
Dmitriy Zaporozhets 70e3409a50 Merge branch 'shell-paths' into 'master'
More reasons why prefixing is good

Inspired by http://www.dwheeler.com/essays/filenames-in-shell.html

See merge request !1604
2015-03-02 21:37:10 +00:00
Dmitriy Zaporozhets 6d1cc94849 Merge branch 'note-attachments-redirect-comment' into 'master'
Add comment about note attachment redirect.

See merge request !1612
2015-03-02 21:36:05 +00:00
Marin Jankovski dae8f2faeb Merge branch 'create_issue_header' into 'master'
New Issue Header

Fixes #2073

- I've switched it from "New Issue" to "Create Issue". Small change, but grammatically correct.

See merge request !1611
2015-03-02 20:58:38 +00:00
Nicolas Bouilleaud 8d0690c5c7 Support names starting with a digit or _ for projects and users
This is what’s actually allowed when creating a user or a project in gitlab.
2015-03-02 11:01:17 +01:00
Stan Hu 4bc5c66fe1 Fix broken project_url routing when protected branches are accessed with an empty repo 2015-03-01 20:26:21 -08:00
Robert Schilling 4e5bc1d535 Merge branch 'master' into 'master'
Error in docs for closing an issue

API docs for issues says you set parameter 'closed' to '1'.  I was not able to do that but I could set 'state_event' to 'close' which closed the issue.

Does not work
"https://gitlab.com/api/v3/projects/:id/issues/:issue_id?closed=1"

Does work
"https://gitlab.com/api/v3/projects/:id/issues/:issue_id?state_event=close"

See merge request !342
2015-03-01 12:02:12 +00:00
Jeroen van Baarsen 93bacb03e5 Merge pull request #8890 from sue445/feature/project_api_avatar_url
Expose avatar_url in projects API
2015-03-01 10:54:42 +01:00
Robert Schilling 7486bc0ae3 Update Dockerfile for GitLab 7.8.1 2015-03-01 09:40:04 +01:00
sue445 51abeaa1bc Expose avatar_url in projects API
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
2015-03-01 10:13:01 +09:00
Robert Schilling 8aabb58d5b Merge pull request #8757 from bbodenmiller/patch-1
formatting cleanup on mysql_to_postgresql.md
2015-02-28 23:14:08 +01:00
Robert Schilling 3678b64b4a Merge pull request #8758 from bbodenmiller/patch-3
use gitlab branch of mysql-postgresql-converter
2015-02-28 23:13:08 +01:00
Robert Schilling e45811c12e Merge pull request #8803 from Bugagazavr/patch-2
Correct json payload [ci skip]
2015-02-28 23:05:27 +01:00
Jeroen van Baarsen 66a82fd8da Merge pull request #8858 from Razer6/update-version-sorter
Update version sorter to 2.0.0, fixes #8572
2015-02-28 22:52:04 +01:00
Douwe Maan ff69685607 Add comment about note attachment redirect. 2015-02-28 17:02:57 +01:00
Robert Schilling 82a9a4c034 Merge pull request #8882 from Shine-neko/master
Fix typo
2015-02-28 07:48:46 +01:00
Sytse Sijbrandij 039fd3c562 Merge branch 'update_logs_document' into 'master'
Mention audit events ee feature in logs documentation.

Related to gitlab/gitlabhq#1979

See merge request !1609
2015-02-28 01:15:36 +00:00
Sabba Petri a41b9533fe Changed to "Create Issue" 2015-02-27 16:24:05 -08:00
Sabba Petri df2353716b Changed header to Create New Issue 2015-02-27 16:22:53 -08:00
Dmitriy Zaporozhets c85935c42a Merge branch 'mmonaco/gitlab-ce-api-user-noconfirm' into 'master'
Add 'confirm' option to users api

For #1990

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/129

See merge request !1610
2015-02-27 22:59:44 +00:00
Mlanawo Mbechezi 9e4d3f328f fix typo 2015-02-27 22:49:40 +01:00
Dmitriy Zaporozhets 0d22b75b03 Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm
Conflicts:
	lib/api/users.rb
2015-02-27 13:01:57 -08:00
Marin Jankovski 238455aa97 Mention audit events ee feature in logs documentation. 2015-02-27 12:32:05 -08:00
Job van der Voort 1aa08c2d80 Merge branch 'update_release_documentation' into 'master'
Remove CI sections related to release tool, update steps in monthly and patch release documentation.

See merge request !1608
2015-02-27 18:43:55 +00:00
Marin Jankovski 3e6b342a1a Remove CI sections related to release tool, update steps in monthly and patch release documentation. 2015-02-27 10:38:15 -08:00
Dmitriy Zaporozhets ada7d0f393 Merge branch 'update_update_project_milestone_path' into 'master'
Update project_milestone_path update route.

See merge request !1605
2015-02-27 17:41:04 +00:00
Dmitriy Zaporozhets 14d8e2b058 Merge branch 'redirect-old-note-attachments-url' into 'master'
Redirect old note attachment path to new uploads path.

See https://gitlab.com/gitlab-org/gitlab-ce/commit/0d884ff2b1beae085050fe6729bd88783891fc71#note_891797

See merge request !1607
2015-02-27 17:11:39 +00:00
Dmitriy Zaporozhets d4aab6528c Merge branch 'fix-user-contributed-projects' into 'master'
Fix and test user contributed projects.

Fixes #2077.

See merge request !1606
2015-02-27 16:35:29 +00:00
Douwe Maan 7202db072f Redirect old note attachment path to new uploads path. 2015-02-27 11:26:47 +01:00
Douwe Maan 804a2488cf Fix and test User#contributed_projects_ids. 2015-02-27 10:49:47 +01:00
Dmitriy Zaporozhets 47c5a2ab22 Merge branch 'autocomplete-mention-count' into 'master'
Include number of affected people in all/group mention autocomplete item.

As mentioned in #2054.

To minimize misuse of all/group mentions, the autocomplete title includes the number of members this mention will notify, so users will be more considerate what groups they mention.

Example:

at-all "**all** All Project and Group Members (12)"

at-gitlab "**gitlab** GitLab (12)"

See merge request !1596
2015-02-27 07:08:23 +00:00
Dmitriy Zaporozhets 42387b733b Merge branch 'route-helper' into 'master'
Introduce shortcuts for routing helpers

See merge request !1600
2015-02-27 07:03:01 +00:00
Dmitriy Zaporozhets 6ac0a0217c Fix syntax issue 2015-02-26 16:44:52 -08:00
Marin Jankovski 62a81494ba Update project_milestone_path update route. 2015-02-26 16:03:42 -08:00
Marin Jankovski 5bf492fe1f Merge branch 'filter_icons_btn' into 'master'
Filter icons look like proper buttons

The filter icons (Push events, Merge events, Comments, Team) now have a border
that signifies they can be pushed. This not only keeps it in line with the rest
of the application buttons, but it makes it more obvious, especially for the
Merge events button with a checkbox icon.

Fixes #1993

See merge request !1576
2015-02-26 19:44:46 +00:00
Marin Jankovski fc7f3bf8a1 Merge branch 'small_profile_changes' into 'master'
Fixes grammatical consistency and small changes

This commit adds consistency to small things like periods, commas,
and gives additional information to buttons and headers, etc.

Fixes #2002, #2005, #2003.

See merge request !1570
2015-02-26 19:38:24 +00:00
Marin Jankovski 6146e2940d Merge branch 'event_tooltip_addition' into 'master'
Added information to tooltips

Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992

See merge request !1571
2015-02-26 18:50:23 +00:00
Dmitriy Zaporozhets f05168b1a1 Merge branch 'import-status-page-link' into 'master'
Fix import status page project links for new Rails.

Fixes #2059.

See merge request !1593
2015-02-26 17:40:06 +00:00
Dmitriy Zaporozhets 386178aedf Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-26 09:36:43 -08:00
Dmitriy Zaporozhets b510223e7f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helper 2015-02-26 09:34:35 -08:00
Dmitriy Zaporozhets 6de4e4a622 Include route helper shortcut in controller 2015-02-26 09:34:20 -08:00
Dmitriy Zaporozhets 01660f0d6d Merge branch 'z_index_for_sticky_header' into 'master'
Add z index for diff header so sticky header stays on top on diff comments.

See merge request !1603
2015-02-26 17:33:03 +00:00
Jacob Vosmaer 4efe3cf556 More reasons why prefixing is good
Inspired by http://www.dwheeler.com/essays/filenames-in-shell.html
2015-02-26 18:25:59 +01:00
Dmitriy Zaporozhets faae454424 Merge pull request #8869 from tsigo/rs-issue-867
Allow mass-unassigning of issues
2015-02-26 09:04:23 -08:00
Marin Jankovski 449cf43a55 Add z index for diff header so sticky header stays on top on diff comments. 2015-02-26 09:03:34 -08:00
Dmitriy Zaporozhets f980827ba6 Merge branch 'fix_gitlab_importer' into 'master'
Fix GitLab && Gitorious importers. Hide already imported projects

Fixes #2060

See merge request !1594
2015-02-26 16:57:26 +00:00
Douwe Maan d3c44b1a6c Fix import status page project links for new Rails. 2015-02-26 09:50:43 +01:00
Dmitriy Zaporozhets 7fef8456e8 Merge branch 'small-fixes' into 'master'
Small fixes

Fixes #2062 and #2061

See merge request !1601
2015-02-26 06:31:50 +00:00