home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,489 Commits 48 Branches 340 Tags
09dbe452e3a57ab6ec68b0af76b32502cbeec00e
Commit Graph
14489 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Patricio Cano 09dbe452e3 Corrected sentence about GitLab Flow 2015-03-03 21:44:53 -08:00
Patricio Cano 92b1b15f6f Corrected images paths 2015-03-03 12:38:45 -08:00
Patricio Cano 01bd632c66 Created documentation on how to fork a project. 2015-03-03 12:31:54 -08:00
Dmitriy Zaporozhets 2f4656b5c7 Merge branch 'strict-rubocop-rules' into 'master' 
Enable ParenthesesAsGroupedExpression rule

See merge request !1617
 2015-03-03 05:58:14 +00:00
Dmitriy Zaporozhets d874c821b4 Merge branch 'brakeman' into 'master' 
Add Brakeman - Static analysis security scanner for Ruby on Rails

See merge request !1616
 2015-03-03 05:57:47 +00:00
Dmitriy Zaporozhets 8348e1a9b5 Enable ParenthesesAsGroupedExpression rule 2015-03-02 18:45:28 -08:00
Dmitriy Zaporozhets f850cff417 Update ci setup documenation 2015-03-02 18:34:29 -08:00
Dmitriy Zaporozhets be165b18d0 Add brakeman and jasmine 2015-03-02 18:22:37 -08:00
Dmitriy Zaporozhets 16e899ca8b Add brakeman rake task and improve code security 2015-03-02 18:11:50 -08:00
Dmitriy Zaporozhets cc877c53ab Add rake task for brakeman 2015-03-02 17:41:05 -08:00
Dmitriy Zaporozhets 5b2b9a1f1f Add brakeman gem 2015-03-02 17:28:47 -08:00
Dmitriy Zaporozhets 704d21f517 Merge branch 'cirosantilli-link-to-button' into 'master' 
Cirosantilli link to button

For https://github.com/gitlabhq/gitlabhq/pull/7912

See merge request !1614
 2015-03-03 00:46:44 +00:00
Dmitriy Zaporozhets 3cc55fe4fe Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-02 15:30:52 -08:00
Dmitriy Zaporozhets 3087be1be7 Merge branch 'less-sql-queries' into 'master' 
Reduce amount of sql queries on dashboard projects page

For https://github.com/gitlabhq/gitlabhq/issues/7218

See merge request !1613
 2015-03-02 23:30:27 +00:00
Dmitriy Zaporozhets 519ca7bae9 Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button 
Conflicts:
	app/views/shared/_issuable_filter.html.haml
 2015-03-02 15:28:22 -08:00
Dmitriy Zaporozhets 7faae7c163 Merge pull request #8092 from cirosantilli/factor-finder-perms 
Factor permission check in issuable finder
 2015-03-02 15:24:59 -08:00
Dmitriy Zaporozhets eb865c43d0 Merge pull request #8349 from divineforest/cleanup-assets-compress 
Remove useless `assets.compress` option, Rails 4 uses only `assets.js_co...
 2015-03-02 15:23:57 -08:00
Dmitriy Zaporozhets 33e107127a Merge pull request #8812 from opichals/teamcity_branchName_not_to_be_whole_ref 
Fix for TeamCity buildQueue REST API build/@branchName.
 2015-03-02 15:23:15 -08:00
Dmitriy Zaporozhets f00feb14ec Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service 
Conflicts:
	app/controllers/projects/services_controller.rb
 2015-03-02 15:22:31 -08:00
Dmitriy Zaporozhets 12581f15ee Merge pull request #7473 from sodabrew/patch-1 
Improve login screen when only OmniAuth providers are enabled
 2015-03-02 15:18:59 -08:00
Dmitriy Zaporozhets e39bf83770 Merge pull request #8501 from AKoetsier/slack_channel_and_username 
Allow a user to specify a channel and username for the slack-webhook
 2015-03-02 15:17:56 -08:00
Dmitriy Zaporozhets f84bd771d4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-02 14:55:45 -08:00
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 27e7534470 Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fix 
[bugfix] Merge request diff view behaviour fix
 2015-03-02 14:28:21 -08:00
Dmitriy Zaporozhets 643afcbe00 Reduce amount of sql queries on dashboard projects page 2015-03-02 14:02:09 -08: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
Aorimn f84b7eef3f Add Irker service 
Irker is a gateway which sends IRC messages on git updates. This new
service provides an interface to this gateway, integrated in Gitlab, for
each updates.
As per the guidelines, this commit adds the new feature in the
CHANGELOG, tests and documentation.

See http://www.catb.org/esr/irker/
 2015-03-01 20:51:03 +01: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
Andrès Koetsier d2c85a68bb Allow a user to specify a channel and username for the slack-webhook 2015-02-28 10:06:32 +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