Commit Graph
22946 Commits
Author SHA1 Message Date
Rubén Dávila 91bd0bf99e Some CSS and sorting fixes. 2016-01-20 00:17:21 -05:00
Rubén Dávila ed4934dbca Fix broken spec. 2016-01-20 00:17:21 -05:00
Rubén Dávila 99679bc6a0 Add specs for Forks listing. 2016-01-20 00:17:21 -05:00
Rubén Dávila 833a0f4d9f Add icon for private forks notice. #2406 2016-01-20 00:17:21 -05:00
Rubén Dávila 40e1ad9052 Add ability to sort forks. #2406 2016-01-20 00:14:58 -05:00
Jacob SchatzandRubén Dávila af501845dd aligns menu at top on one row 2016-01-20 00:14:58 -05:00
Jacob SchatzandRubén Dávila 8f0eee0638 changing projects css 2016-01-20 00:14:58 -05:00
Rubén Dávila 5cba592469 WIP: Add sort dropdown. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila b0a5a99e96 Little update to copy and custom content for empty results. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila b6170d2d8b Show last commit as description. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila e4d2696691 Fix broken specs. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila f0b7dcba30 Add ability to filter by namespace. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 55707f9589 Use adequate icon for Forks link on sidebar. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 3b75d65bd3 Show forks counter on listing. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila b2e5b57fab Add fork button and implement ability to distinguish between public and protected forks. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 2b05bf4be5 Use Project creator's avatar in fork listing. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 7765ce1875 Setup new fork link in sidebar and routes. #2406 2016-01-20 00:14:58 -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
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
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
Dmitriy Zaporozhets 0782ca771a Merge branch 'browse-issues-incorrect-positioning-in-firefox-on-commit-page' into 'master'
Fix positioning issues with browse files button

Issue is that in Firefox clipboard is blocking the browse files
from moving all the way to the right.
Move clipboard up 1px into -1px to unblock "browse files"

SS from firefox:

![Screen_Shot_2016-01-18_at_4.01.58_PM](/uploads/312a5f1e55ca707081f718e2413416fb/Screen_Shot_2016-01-18_at_4.01.58_PM.png)

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


See merge request !2489
2016-01-19 02:14:39 +00:00
Douglas Barbosa Alexandre 96440042a9 Raise an error on page load if there are pending migrations on dev env 2016-01-19 00:12:30 -02:00
Douglas Barbosa Alexandre bddef293d6 Ensure that doesn't have pending migrations when running the specs 2016-01-19 00:12:30 -02:00
Dmitriy Zaporozhets 3d7994a792 Merge branch 'search-title-clipped' into 'master'
Search title gets clipped vertically.

Fixed by adding height to search title css.

**Before:**
![Screen_Shot_2016-01-16_at_10.12.14_AM](/uploads/2651de6ae38251e1f20acade0c69a629/Screen_Shot_2016-01-16_at_10.12.14_AM.png)

**After:**
![Screen_Shot_2016-01-16_at_10.12.05_AM](/uploads/6852e9a653bde1975d7fdfa4dbc302d8/Screen_Shot_2016-01-16_at_10.12.05_AM.png)

See merge request !2460
2016-01-19 01:59:04 +00:00
Dmitriy Zaporozhets 4d31789e4e Merge branch 'sorting-dropdown-does-not-fit-filter-bar' into 'master'
Reduce margin to fit dropdowns

![Screen_Shot_2016-01-18_at_7.51.23_PM](/uploads/03336f86fde25d6d045742297a19751c/Screen_Shot_2016-01-18_at_7.51.23_PM.png)

Fixes #10747 

See merge request !2492
2016-01-19 01:55:45 +00:00
Jacob Schatz fbb27a4244 Fix spacing issues, fix naming inconsistencies. Fix conflicts.
Used `issuable` instead
2016-01-18 20:17:29 -05:00
Jacob Schatz 8b3d679345 color variable for error for exclamation point 2016-01-18 20:12:06 -05:00
Jacob Schatz 3c078cef41 adds exclamation point when assigned user cannot merge 2016-01-18 20:12:06 -05:00
Jacob Schatz 1133251f08 Reduce margin to fit dropdowns
Fixes #10747
2016-01-18 19:54:37 -05:00