home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,082 Commits 48 Branches 340 Tags
229f3ce9cec8d525d960cabc7a915b47dfdcd910
Commit Graph
1134 Commits
Author SHA1 Message Date
Grzegorz Bizon a6260b1eb7 Remove code that removes duplicate CI variables 
At this point this is being handled by GitLab Runner and we need to
introduce this as a separate merge request.
 2016-04-18 13:17:48 +02:00
Grzegorz Bizon bdb06fa043 Improve build specs for job environment variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon b7946b50fc Read job variables directly from gitlab CI config 2016-04-18 13:17:48 +02:00
Grzegorz Bizon b578fbfb85 Make it possible to override build variables 2016-04-18 13:17:47 +02:00
Grzegorz Bizon a1363d39c6 Add variables keyword to job in CI config YAML 2016-04-18 13:17:47 +02:00
Yorick Peterse 651c3e841d Instrument Repository.clean_old_archives 2016-04-18 12:33:11 +02:00
BaldinoF b04140a1e4 Merge branch 'master' into number_sign_for_external_issue_ref 2016-04-17 18:17:27 +02:00
Robert Schilling 3c704c33e0 Delete tags via rugged 2016-04-15 16:05:04 +02:00
Douwe Maan 447a905088 Merge branch 'rs-trailing-slash-in-search' into 'master' 
Escape the query argument provided to `git grep` by `search_files`

Closes #14963.

See merge request !3633
 2016-04-15 06:46:47 +00:00
Rémy Coutable 64776ab2b4 Merge branch 'start-with-iid-on-new-branch' into 'master' 
Start with iid on branch creation

After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.

See merge request !3708
 2016-04-14 13:41:30 +00:00
Zeger-Jan van de Weg 0385cd5a58 Start with iid on branch creation 2016-04-14 14:49:45 +02:00
Frank Groeneveld 2fd05aed46 Allow empty recipient list when pusher is added 
Closes #13574
 2016-04-14 10:24:09 +02:00
Robert Speicher 0b447a9977 Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' 
Fix a bug with trailing slash in bamboo_url

Also, improve specs for BambooService

Similar to !3679.

See merge request !3680
 2016-04-13 16:18:46 +00:00
Robert Speicher 6020602359 Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master' 
Fix trailing slash in teamcity_url

Originally opened at !2309 by @ctmay4.

As described in #3515, if you have trailing spaces in the the Teamcity server name, the service
will not work properly.  Switching from `URI.parse` to `URI.join` fixes it so that it works with
or without a trailing slash.

Fixes #3515.

See merge request !3679
 2016-04-13 16:17:39 +00:00
Rémy Coutable acf911eeae Fix a bug with trailing slash in bamboo_url 
Also, improve specs for BambooService

Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-13 15:58:14 +02:00
Rémy Coutable 3ea955a637 Improve TeamcityService and its specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-13 10:01:49 +02:00
Stan Hu 2ce7559d70 Fix repository cache invalidation issue when project is recreated with an empty repo 
To reproduce:

1. Create a project with some content
2. Rename the project
3. Create a new project with the same name.
4. Boom - 404.

After step 2, the branch and tag counts were not being cleared. This would
cause `repository.has_visible_content?` to erroneously return `true`
for the newly-created project.

Closes #13384
 2016-04-13 00:04:17 -07:00
Baldinof 3918fce5bd Hide number sign for string prefixed external issues 2016-04-12 10:01:52 +02:00
Robert Speicher 5ffa8f0570 Escape the query argument provided to git grep by search_files 
Closes #14963.
 2016-04-09 18:50:21 -04:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Stan Hu 27b9f64efb Expire caches after project creation to ensure a consistent state 
Closes #14961
 2016-04-07 00:29:01 -07:00
Rémy Coutable e79b867d2b Ensure empty recipients are rejected in BuildsEmailService 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-06 16:14:51 +02:00
Douglas Barbosa Alexandre f2005fa566 Flush repository cache before import project data 
GitHub Pull Requests importer handle with the repository while
importing data, we need to make sure that the cached values are valid.
 2016-04-04 19:35:39 -03:00
Rubén Dávila e6b5716785 Migrate Repository#local_branches from gitlab-ee. 
This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee
 2016-04-01 14:21:08 -05:00
Rémy Coutable f9ab215b21 Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'master' 
Allow temp-oauth-email as notification email

Closes #14559 

/cc @dblessing @rymai 

See merge request !3477
 2016-04-01 14:12:42 +00:00
connorshea 85cc172959 Remove "Congratulations!" tweet button on newly-created project. 
I’ve removed everything related to the feature based on this commit:
ce08f919f34fd8849834365

Resolves #10857.
 2016-03-31 17:09:36 -06:00
Zeger-Jan van de Weg 1e7116b34d Exclude projects pending deletion from all results 2016-03-31 20:20:18 +02:00
Zeger-Jan van de Weg 2c6207135e Allow temp-oauth-email as notification email 2016-03-31 19:59:19 +02:00
Rémy Coutable 95c7aa62de Merge branch 'fix-todos' into 'master' 
Destroy related todos when an Issue/MR is deleted

Closes #14550 

Closes #14598

See merge request !3376
 2016-03-31 16:43:12 +00:00
Yorick Peterse 84764847f7 Merge branch 'reorder-project-expire-cache' into 'master' 
Expire the exists cache before deletion to ensure project dir actually exists

See merge request !3413
 2016-03-30 22:51:36 +00:00
Zeger-Jan van de Weg 4b1ad75ab5 minor cleanup in system_hook_spec 2016-03-30 20:00:57 +02:00
Douglas Barbosa Alexandre 9b93f8adc8 Destroy related todos when an issue is deleted 2016-03-30 12:09:34 -03:00
Dmitriy Zaporozhets 630c86a7a3 Add spec for user_id uniq in NotificationSetting model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 4ca73f56cb Small refactoring and cleanup of notification logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 31b0e53015 Introduce NotificationSetting model 
It will hold notification setting per group or per project. It will
allow get rid of notification level stored in Member model

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Robert Speicher a9f5df384e Merge branch 'fix_wip_in_mr_api' into 'master' 
Ensuring Merge Request API returns boolean values for work_in_progress

Fixes #14692.

See merge request !3432
 2016-03-29 18:49:08 +00:00
Abhi Rao 762d6ab4fd Ensuring Merge Request API returns boolean values for work_in_progress 
Fixes #14692
 2016-03-28 22:11:44 -05:00
Stan Hu 2fa20f2d4f Handle nil descriptions in Slack issue messages 
Closes #14676
 2016-03-28 04:15:41 -07:00
Stan Hu 2e328c1ea7 Expire the exists cache before deletion to ensure project dir actually exists 
Closes #14659
 2016-03-27 08:52:44 -07:00
Stan Hu c1834664a7 Merge branch 'handle-avatar-in-empty-repo' into 'master' 
Don't attempt to look up an avatar in repo if repo directory does not exist

Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/

Closes #14580



See merge request !3390
 2016-03-27 00:21:57 +00:00
Dmitriy Zaporozhets 2fdf928afa Merge branch 'ci-setup-info' into 'master' 
Add links to CI setup documentation from project settings and builds pages

For #14483 

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

See merge request !3384
 2016-03-26 09:57:47 +00:00
Stan Hu 506878970b Don't attempt to look up an avatar in repo if repo directory does not exist 
Closes #14580
 2016-03-25 06:30:51 -07:00
Dmitriy Zaporozhets 9e7e2c6b9d Small refactoring and rewording 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 13:18:55 +01:00
Douglas Barbosa Alexandre 39a51f9e1c Rename Event#proper? to Event#visible_to_user? 2016-03-24 14:24:22 -03:00
Douglas Barbosa Alexandre 239560331a Comments on confidential issues doesn't show in activity feed to non-members 2016-03-24 14:22:01 -03:00
Dmitriy Zaporozhets b105b84e3a Use head tree (cached) for file search. Also add some tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-24 15:38:16 +01:00
Grzegorz Bizon 915bfedfa7 Do not allow to move issue if it has not been persisted 2016-03-23 09:41:39 +01:00
Baldinof b372968e93 Add number sign on external issue reference text 2016-03-22 15:36:50 +01:00
Douwe Maan 31266c5be4 Address feedback 2016-03-22 00:09:20 +01:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00