Commit Graph
22960 Commits
Author SHA1 Message Date
Robert Speicher 67bd2ed3a2 Merge branch 'adjust-unicorn-memory-limits' into 'master'
Use ENV variables for Unicorn worker killer & increase default limits

Merge request that lead to this particular merge request:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2421

[ci skip]

See merge request !2513
2016-01-20 18:44:51 +00:00
Douwe Maan 2d8b6901ba Merge branch 'update-gitlab_git' into 'master'
Upgraded gitlab_git to fix issue #5858

This updates the dependency on gitlab_git and fixes #5858 - reproduced locally and issue disappears with the change.

Related MR that actually adds branch name support to commits_between: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/61

See merge request !2516
2016-01-20 18:24:58 +00:00
Dmitriy Zaporozhets 7c01a91bb7 Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master'
Fixes tooltip doesn't duplicate the "me" name.

Checks that "me" is not in the array of names in tooltip

![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978


See merge request !2454
2016-01-20 17:50:00 +00:00
Dmitriy Zaporozhets 5ad60c5dda Merge branch 'secret-shortcut-feature' into 'master'
Adds "t" as a shortcut for find file anywhere



See merge request !2507
2016-01-20 16:39:43 +00:00
James Lopez 419a5e00eb updated gitlab_git to fix issue #5858 and updated changelog 2016-01-20 17:12:30 +01:00
Achilleas Pipinellis 41c5c391b3 Merge branch 'patch-1' into 'master'
Fixed invalid JSON in first JSON Example

Just a comma missing

See merge request !2487
2016-01-20 16:12:00 +00:00
Jacob Schatz 7377abf84a Simplifies the HAML if statement for project branch URL 2016-01-20 10:50:26 -05:00
Douwe Maan b4faa59728 Merge branch 'issue_3749' into 'master'
Update Issues/MRs updated_at field when notes are generated

Closes #3749 and #9130

See merge request !2493
2016-01-20 15:06:49 +00:00
Douwe Maan f8f96994f7 Merge branch 'ci/artifacts-remove-compressed-size' into 'master'
Remove `Compressed to` column from build artifacts browser

See #10982.

See merge request !2509
2016-01-20 14:33:01 +00:00
Yorick Peterse 89c65a3789 Increase Unicorn memory limits to 300-350
Using this limit on GitLab.com it appears we're able to reduce response
timings by about 620 milliseconds compared to the previous limit.

See gitlab-org/gitlab-ce!2421 for more information.
2016-01-20 11:52:01 +01:00
Yorick Peterse 21fab4f413 Use env variables for Unicorn memory limits
This makes it easier for users to use their own limits based on their
server configuration.
2016-01-20 11:51:49 +01:00
Achilleas Pipinellis 481644ca7c Merge branch 'patch-1' into 'master'
[ci skip] Fixed minor typo in workflow documentation

This change is self-explanatory.

See merge request !2503
2016-01-20 09:54:52 +00:00
Grzegorz Bizon 6d09338f88 Remove Compressed to column from build artifacts browser
See #10982.
2016-01-20 08:51:34 +01:00
Jacob Schatz f1b4f20c75 Fix HTML so code passes
Code was failing because branch was named `'test'` with quotes
which was escaping the javascript I was using.
2016-01-20 02:09:19 -05:00
Jacob Schatz 106939fa2a Fixes test to not search whole page for content. 2016-01-20 01:52:01 -05:00
Jacob Schatz 70e59035c0 Fix project find url so branch ref is not nil
Also adds autocomplete="off" to find input.
2016-01-19 21:39:48 -05:00
Rubén Dávila c26816f7a7 Fix broken specs. 2016-01-19 17:35:43 -05:00
Robert Speicher a382ad99ef Update CHANGELOG
- Add attribution for Anton Baklanov
- Remove attributions for employees

[ci skip]
2016-01-19 16:45:11 -05:00
Robert Speicher 1f9c360d7b Merge branch 'add_email_headers' into 'master'
Added X-GitLab-... headers to emails from CI and Email On Push services

Fixes #2098

This adds the 'X-GitLab-Project', 'X-GitLab-Project-Id' and
'X-GitLab-Project-Path' headers to emails from CI and Email On Push in a way
that it is done currently for merge requests and issues emails.

Additionally, CI emails will have 'X-GitLab-Build-Status' header with either
'fail' or 'success'.

Emails from Email On Push will include 'X-Gitlab-Author' header containing the
username of user who did the push.

See merge request !2159
2016-01-19 21:23:54 +00:00
Jacob Schatz e5cbd5885a Fixes issue where other emoji (not thumbup/thumbdown) were not removed 2016-01-19 15:43:04 -05:00
Jacob Schatz 4784695860 Proper spacing in HAML file if statement. 2016-01-19 15:04:12 -05:00
Rubén Dávila 35a776754c Update Issue/MR everytime a Note is saved/destroyed. 2016-01-19 15:02:26 -05:00
Jacob Schatz 60dbc4f687 Removes defined? in favor to just if 2016-01-19 14:38:45 -05:00
Jacob Schatz ecbb8d73eb Add reference to the correct branch.
sometimes `@ref` will be `nil`.
this makes sure that the correct branch is passed in.
2016-01-19 14:37:00 -05:00
Jacob Schatz 34564296d0 Adds t as a shortcut for find file anywhere 2016-01-19 14:25:27 -05:00
Robert Speicher b9fca47854 Merge branch 'user-ldap-email' into 'master'
Allow LDAP users to change their email if it was not set by the LDAP
server

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3054

See merge request !2502
2016-01-19 19:15:23 +00:00
Dmitriy Zaporozhets 20cc4bc475 Merge branch 'add-public-param-to-project-api' into 'master'
Add public params to GET /projects api. Closes #3788



See merge request !2409
2016-01-19 18:51:38 +00:00
Dmitriy Zaporozhets 084614dec8 Merge branch 'star-button-fork-count-increase' into 'master'
Starring project only increases star count

This is instead of increasing star & fork count

Fixes #11396

![star-count](/uploads/9a1d569393bc051d1a019f0340eec957/star-count.gif)

cc. @jschatz1 

See merge request !2504
2016-01-19 18:41:26 +00:00
Anton Baklanov 84124380e8 Added X-GitLab-... headers to emails from CI and Email On Push services
Fixes #2098
2016-01-19 20:18:39 +02:00
Dmitriy Zaporozhets 340df52bc7 Merge branch 'display-message-when-assignee-cannot-merge' into 'master'
adds exclamation point when assigned user cannot merge

Fixes: #4175 

See merge request !2408
2016-01-19 17:35:29 +00:00
Douwe Maan 4f44455626 Merge branch 'master' into user-ldap-email
# Conflicts:
#	db/schema.rb
2016-01-19 18:30:59 +01:00
Phil Hughes 2821306a74 when starring a project it correctly increase the star count
This is instead of increasing star & fork count

Fixed #11396
2016-01-19 16:48:53 +00:00
Douwe Maan c8d66514ef Merge branch 'fix-project-creation' into 'master'
Creator should be added as a master of the project on creation

Fixes: #4222

See merge request !2463
2016-01-19 16:37:06 +00:00
John Galt 1c728ddbce Fixed typo 2016-01-19 16:07:46 +00:00
Douwe Maan dec341ca39 Merge branch 'improve-project-external-issue-trackers' into 'master'
Greatly improve external_issue_tracker performance

See 3d41133d48f6522b8755bb91b804864e8e520871 for all the details. As an aside, this commit contains a set of migrations that will introduce downtime as they add a column with a default value which in turn locks the entire table (at least on PostgreSQL).

See merge request !2498
2016-01-19 15:39:22 +00:00
Douwe Maan 98e1a5b634 Allow LDAP users to change their email if it was not set by the LDAP server 2016-01-19 16:25:38 +01:00
Douglas Barbosa Alexandre 2ece1b774a Fix creator should be added as a master of the project on creation 2016-01-19 13:24:42 -02:00
Josh Frye ae6080c791 Add specs. Adjust filter. 2016-01-19 09:57:00 -05:00
Josh Frye 11797df1af Change 'public' flag to more robust 'visibility' query. 2016-01-19 09:57:00 -05:00
Josh Frye 6951396dbe Update all docs for public param 2016-01-19 09:57:00 -05:00
Josh Frye 10669097fa Add public params to GET /projects api. Closes #3788 2016-01-19 09:57:00 -05:00
Jacob Schatz f5562355f4 Move multiple css rules to multiple lines.
Removes extra line breaks.
2016-01-19 08:44:16 -05:00
Yorick Peterse b4ee6f57b9 Greatly improve external_issue_tracker performance
This greatly improves the performance of Project#external_issue_tracker
by moving most of the fields queried in Ruby to the database and letting
the database handle all logic. Prior to this change the process of
finding an external issue tracker was along the lines of the following:

1. Load all project services into memory.
2. Reduce the list to only services where "issue_tracker?" returns true
3. Reduce the list from step 2 to service where "default?" returns false
4. Find the first service where "activated?" returns true

This has to two big problems:

1. Loading all services into memory only to reduce the list down to a
   single item later on is a waste of memory (and slow timing wise).
2. Calling Array#select followed by Array#reject followed by Array#find
   allocates extra objects when this really isn't needed.

To work around this the following service fields have been moved to the
database (instead of being hardcoded):

* category
* default

This in turn means we can get the external issue tracker using the
following query:

    SELECT *
    FROM services
    WHERE active IS TRUE
    AND default IS FALSE
    AND category = 'issue_tracker'
    AND project_id = XXX
    LIMIT 1

This coupled with memoizing the result (just as before this commit)
greatly reduces the time it takes for Project#external_issue_tracker to
complete. The exact reduction depends on one's environment, but locally
the execution time is reduced from roughly 230 ms to only 2 ms (= a
reduction of almost 180x).

Fixes gitlab-org/gitlab-ce#10771
2016-01-19 14:03:20 +01:00
Grzegorz Bizon 425f8d6f57 Merge branch 'fix/artifacts-double-propagation' into 'master'
Fix double request issue in artifacts browser

This fixed problem with double propagation when clicking a link that lies inside tr with clicked event attached.

See merge request !2496
2016-01-19 12:48:35 +00:00
Grzegorz Bizon 19608d3ee0 Fix double request issue in artifacts browser 2016-01-19 13:32:28 +01:00
Douwe Maan f6e14431a0 Merge branch 'feature/expose-ci-lint-tool' 2016-01-19 11:52:20 +01:00
Douwe Maan e9c3d0424f Merge branch 'fix-consider-re-assign-as-a-mention' 2016-01-19 11:37:14 +01:00
Robert Speicher 2becc6fae9 Merge branch 'warning-pending-migrations' into 'master'
Raise an error on page load when there are pending migrations in
development mode.

Fixes #5990 

See merge request !2491
2016-01-19 03:01:14 +00:00
Rubén Dávila 08c482b87a Check if object respond to #touch before update. 2016-01-18 21:59:22 -05:00
Rubén Dávila 78754cb1c9 Update Issues/MRs updated_at when user leaves comments. 2016-01-18 21:39:23 -05:00