Commit Graph
31274 Commits
Author SHA1 Message Date
Jacob Schatz bcebdee751 Merge branch '18942-dropdowns-should-apply-any-present-filter-once-data-is-loaded' into 'master'
Fixed dropdown not filtering queries entered before data is loaded

## What does this MR do?

Triggers a 'keyup' event on a filters input to force it to process any text that was added before the data was retrieved and rendered.

## Are there points in the code the reviewer needs to double check?

😕 

## Why was this MR needed?

UX

## What are the relevant issue numbers?

Closes #18942.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4846
2016-06-28 20:02:52 +00:00
Robert Speicher 3b33cbb211 Update CHANGELOG for 8.8.6 and 8.7.8
[ci skip]
2016-06-28 15:36:17 -04:00
Jacob Schatz 5d5a4dca13 Merge branch 'as-fix-changelog' into 'master'
Fix CHANGELOG

Fixes double header for 8.9.3 entries

See merge request !4971
2016-06-28 17:58:02 +00:00
Rémy Coutable b8d75d41aa Merge branch 'fix/builds-api-builds-for-commit-search' into 'master'
Find all builds for commit if there are multiple pipelines for it

## What does this MR do?

This MR fixes a builds API. When multiple pipelines were triggered for a commit, then API returned builds only from the last pipeline.

## What are the relevant issue numbers?

Closes #18912  
Closes #19243 

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4849
2016-06-28 17:10:07 +00:00
Robert Speicher 53ad9522c4 Merge branch 'performance-clock-adjustments' into 'master'
Use clock_gettime for all performance timestamps

This MR adjusts the performance monitoring code to use `Process.clock_gettime` (thus `clock_gettime(3)`) instead of `Time.now`.

Using `Time.now` / `Time.new` adds more overhead than `Process.clock_gettime`, it also doesn't provide a way of getting timestamps in nanoseconds (which `Process.clock_gettime` does allow).

See merge request !4899
2016-06-28 16:32:02 +00:00
Jacob Schatz 6ff039ac44 Merge branch 'lbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-page' into 'master'
Implement UI for new project page

## What does this MR do?

Updates the project creation page to conform with the latest UI updates.

## Are there points in the code the reviewer needs to double check?

Ney.

## Why was this MR needed?

Updated UI.

## What are the relevant issue numbers?

Closes #2542.

## Screenshots (if relevant)

**Desktop:**

![Screen_Shot_2016-06-18_at_04.00.48](/uploads/0313eee96a2aef9ed5e048989548b133/Screen_Shot_2016-06-18_at_04.00.48.png)

**Mobile:**

![Screen_Shot_2016-06-18_at_04.01.00](/uploads/505b110c3fcbf523aac08797db9f6781/Screen_Shot_2016-06-18_at_04.01.00.png)

See merge request !4766
2016-06-28 16:19:46 +00:00
Alfredo Sumaran af3bea9bb9 Fix CHANGELOG 2016-06-28 16:06:59 +00:00
Yorick Peterse d7b4f36a3c Use clock_gettime for all performance timestamps
Process.clock_gettime allows getting the real time in nanoseconds as
well as allowing one to get a monotonic timestamp. This offers greater
accuracy without the overhead of having to allocate a Time instance. In
general using Time.now/Time.new is about 2x slower than using
Process.clock_gettime(). For example:

    require 'benchmark/ips'

    Benchmark.ips do |bench|
      bench.report 'Time.now' do
        Time.now.to_f
      end

      bench.report 'clock_gettime' do
        Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
      end

      bench.compare!
    end

Running this benchmark gives:

    Calculating -------------------------------------
                Time.now   108.052k i/100ms
           clock_gettime   125.984k i/100ms
    -------------------------------------------------
                Time.now      2.343M (± 7.1%) i/s -     11.670M
           clock_gettime      4.979M (± 0.8%) i/s -     24.945M

    Comparison:
           clock_gettime:  4979393.8 i/s
                Time.now:  2342986.8 i/s - 2.13x slower

Another benefit of using Process.clock_gettime() is that we can simplify
the code a bit since it can give timestamps in nanoseconds out of the
box.
2016-06-28 17:51:25 +02:00
Fatih Acet 7a94432e18 Merge branch 'remove-gon-variable' into 'master'
Unused gon variable with very bad performance

## What does this MR do?

Remove an unused variable with a lot of performance penalty. It was opening a transaction just to return a constant string.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added

See merge request !4969
2016-06-28 15:29:45 +00:00
Grzegorz Bizon 2b8f04a669 Remove redundant check in commit builds API endpoint 2016-06-28 17:15:38 +02:00
Paco Guzman b5fa56eb3f Unused got variable with very bad performance
In any case if just want the value which is always ‘gitlab’

require 'benchmark/ips'

Project.first # To load database things
GitlabIssueTrackerService.first # To load database things

Benchmark.ips do |x|
  x.config(:time => 5, :warmup => 2)

  x.report("current") do
    Project.new.default_issue_tracker.to_param
  end

  x.report("") do
    'gitlab'
  end

  x.compare!
end

Calculating -------------------------------------
             current     4.000  i/100ms
                        30.938k i/100ms
-------------------------------------------------
             current     47.298  (±10.6%) i/s -    232.000 
                          4.366M (±20.9%) i/s -     17.202M

Comparison:
                    :  4366456.0 i/s
             current:       47.3 i/s - 92318.26x slower
2016-06-28 17:01:37 +02:00
Achilleas Pipinellis 1ade080ec8 Merge branch 'iankelling-api-doc' into 'master'
docs: fix default_branch_protection default



See merge request !4479
2016-06-28 14:57:42 +00:00
Dmitriy Zaporozhets abc6004fae Merge branch '19170-mobile-buttons' into 'master'
Switched mobile button icons to ellipsis and angle

## What does this MR do?
Switches the mobile button icons

## What are the relevant issue numbers?
Closes #19170   
Part of #19200 

## Screenshots (if relevant)
![Screen_Shot_2016-06-27_at_9.08.28_AM](/uploads/7784489402e342e671d02b24d2ea0d64/Screen_Shot_2016-06-27_at_9.08.28_AM.png)


See merge request !4944
2016-06-28 14:28:56 +00:00
Alfredo SumaranandDmitriy Zaporozhets ca92ad9043 Update CHANGELOG 2016-06-28 16:01:42 +02:00
Annabel DunstoneandDmitriy Zaporozhets 706c5a1399 Switched mobile button icons to ellipsis and angle 2016-06-28 16:01:42 +02:00
Dmitriy Zaporozhets bbbd0e6c81 Merge branch '19171-pinned-width' into 'master'
Resolve "Pin should show up at 1280px min"

## What does this MR do?
Decreased window min width for pinned sidebar

## What are the relevant issue numbers?
Closes  #19171    
Part of #19200 

## Screenshots (if relevant)
![Screen_Shot_2016-06-27_at_9.36.13_AM](/uploads/d0a87bca5af1bee808c5b1046c0ecf72/Screen_Shot_2016-06-27_at_9.36.13_AM.png)

See merge request !4947
2016-06-28 13:57:14 +00:00
Kamil Trzciński ec1029922e Merge branch 'use-git-depth' into 'master'
Use GIT_DEPTH for builds

## What does this MR do?
Enables experimental feature to use shallow cloning. 

## Why was this MR needed?
To speed up the builds and reduce the pressure on NFS servers. This should save us between 30s to 1m of the time of each build.

## More information
 `GIT_DEPTH`: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/188

## Problems
- Too small value for `GIT_DEPTH` can make it impossible to retry old changes.
You will see `unresolved reference` in build log.
We should then reconsider changing `GIT_DEPTH` to higher value
- Mechanism that rely on `git describe` may not work correctly when `GIT_DEPTH` is set. This will happen, because only part of the git history is present on the build machine

## Requirements
GitLab Runner 1.3.0. Currently all our internal runners use beta release or 1.3.0 with support for `GIT_DEPTH`.

@pcarranza Please decide when to merge that. We should start monitoring to see an impact on our NFS servers.

cc @jacobvosmaer-gitlab @pcarranza 


See merge request !4730
2016-06-28 13:46:16 +00:00
Achilleas Pipinellis 9315597adb Merge branch 'add-smtp-upgrade-info' into 'master'
Add SMTP upgrade information

8.8 to 8.9 requires an update to the SMTP settings for source installs.

See merge request !4966
2016-06-28 13:11:26 +00:00
Annabel DunstoneandPhil Hughes b262e240aa Update CHANGELOG 2016-06-28 13:42:35 +01:00
Annabel DunstoneandPhil Hughes 2e1a70fefc Decreased window min width for pinned sidebar 2016-06-28 13:41:46 +01:00
Stan Hu 3be80540aa Add SMTP upgrade information
Closes #19252

[ci skip]
2016-06-28 04:27:40 -07:00
Grzegorz Bizon 087f080871 Add documentation for commit builds API improvements 2016-06-28 13:04:11 +02:00
Grzegorz Bizon ed6c87a5b4 Add Changelog entry for commit builds API fix 2016-06-28 12:52:27 +02:00
Achilleas Pipinellis 365015e3c9 Merge branch 'gitlab_architecture' into 'master'
Refactor GitLab architecture document

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

See merge request !3694
2016-06-28 10:34:46 +00:00
Rémy Coutable 1897d75bdc Merge branch 'display-deleted-ref-in-events' into 'master'
Display last commit of deleted branch in push events

## What does this MR do?

Display the last commit of a deleted branch in the push events of a project.

## Are there points in the code the reviewer needs to double check?

Is the change in `app/models/event.rb` the correct way to display a two-line event for deleted branches?

## Why was this MR needed?

It is easier to restore an accidentally deleted branch if the commit hash is displayed in the push events.

## What are the relevant issue numbers?

Fixes #18659

## Screenshots

### Before garbage collection

![before-gc](/uploads/5674cd53e1564d48b7f2f8406ea0fbed/before-gc.png)

### After garbage collection

![after-gc](/uploads/80950c1932feeb3b69d0fc11b8f7acf4/after-gc.png)

See merge request !4699
2016-06-28 10:30:03 +00:00
Grzegorz Bizon b9b95a9f19 Improve commit builds API endpoint RESTful behavior
1. Return 404 if commit is not found (RESTful resource not found)
2. Return an empty array if pipeline is not found (resource present, no
   associated builds found)
3. Return an empty array if pipeline found but no builds there (resource
   present, no associated builds)
2016-06-28 12:22:31 +02:00
winniehell 8fb4c506e2 Display last commit of deleted branch in push events (!4699) 2016-06-28 11:49:30 +02:00
Grzegorz Bizon 8e66618749 Find all builds for commit if multiple pipelines 2016-06-28 11:34:49 +02:00
Rémy Coutable 2c3f3cb392 Merge branch 'fix/attr-encrypted-issue' into 'master'
Fix encrypted data backwards compatibility after upgrading attr_encrypted gem

Adds missing attribute to attr_encrypted so it is fully backwards-compatible. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19073

See merge request !4963
2016-06-28 08:48:06 +00:00
Rémy Coutable 0d0f8a3b7d Merge branch 'feature/custom-highlighting' into 'master'
Add custom highlighting via .gitattributes

## What does this MR do?
Allows user control of language selection via a `gitlab-language` entry in `.gitattributes`

## Are there points in the code the reviewer needs to double check?
(paired with @stanhu)

## Why was this MR needed?
Guessing languages by filename is fraught and often wrong. In one project, `foo.pl` may be perl, and in another it may be prolog. Users might have a Thingfile that needs ruby highlighting, or depend on things that can't work in general, like `*.C` (capitalized) mapping to C++ instead of C.

This allows the user to override language choice so they never have to look at a mis-highlighted file.

## What are the relevant issue numbers?
https://github.com/jneen/rouge/issues/494
https://gitlab.com/gitlab-org/gitlab-ce/issues/13818 (*.tpl can't in general map to Smarty)
https://gitlab.com/gitlab-org/gitlab-ce/issues/13615 (in cases we don't have a language and mis-identify it, users could map to 'text' to turn off highlighting)

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added (N/A)
- [x] Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4606
2016-06-28 08:42:42 +00:00
James Lopez ea441cf27e add changelog 2016-06-28 09:57:13 +02:00
James Lopez 31c95aa031 add missing attribute to attr_encrypted so it is fully backwards-compatible 2016-06-28 09:55:19 +02:00
Chris Wilson 5eba2670c7 Add "GitLab team members only" to diagram link 2016-06-28 03:12:26 +00:00
Luke "Jared" Bennett 957143347c Wiped old page and started on new UI
Completed new project page

Updated CHANGELOG

Corrected 'Create project' button

Made responsive

Added gitlab export button

Changed Spinach test to match updated UI

reverted test changes and fixed UI

Corrected 'Repo by URL' text

Fixed static namespace style

Added errors partial

Added padding to bottom of page-with-sidebar
2016-06-28 01:17:01 +01:00
Robert Speicher c9a4626333 Merge remote-tracking branch 'dev/master' 2016-06-27 18:39:42 -04:00
http://jneen.net/ ffd8162191 doc: note that .gitattributes uses default branch 2016-06-27 14:17:49 -07:00
http://jneen.net/ f06fe77531 use the conf lexer so we have highlighted comments 2016-06-27 14:17:49 -07:00
http://jneen.net/ 8c15989621 first draft of docs 2016-06-27 14:17:49 -07:00
http://jneen.net/ 66b37149eb support cgi style options, such as erb?parent=json 2016-06-27 14:17:49 -07:00
http://jneen.net/ e7b512efa6 move the path alias to a more appropriate location 2016-06-27 14:17:49 -07:00
http://jneen.net/ e08ff468e8 make #custom_language private 2016-06-27 14:17:49 -07:00
http://jneen.net/ c8b52761bc appease rubocop 2016-06-27 14:17:49 -07:00
http://jneen.net/ 5ff8371c5e add an alias for Snippet#path 2016-06-27 14:17:49 -07:00
http://jneen.net/ 9fc53864dd appease rubocop 2016-06-27 14:17:49 -07:00
http://jneen.net/ 5415c67424 check the tag so that an instance will pass too 2016-06-27 14:17:49 -07:00
http://jneen.net/ cd9bea770b fix the spec, using project.change_head 2016-06-27 14:17:49 -07:00
http://jneen.net/ 8d24ca157d Revert "bump the master sha for gitlab-test!9"
This reverts commit b435d7405364d28ec364072f4437512da2876762.
2016-06-27 14:17:49 -07:00
http://jneen.net/ d76a89bf7f bump the master sha for gitlab-test!9 2016-06-27 14:17:49 -07:00
http://jneen.net/ f8b80f7fae add custom highlighting via .gitattributes
paired with @stanhu
2016-06-27 14:17:49 -07:00
Robert Speicher 0fd4b9d3e2 Merge branch 'rename_license_template_api' into 'master'
Rename Licenses API to License Templates API

## What does this MR do?

Earlier I renamed this in EE, thinking license templates was an EE-only feature. This backports that change to CE. Thanks to @vsizov for pointing out this error.

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/400 for the EE merge request. 

See merge request !4957
2016-06-27 20:15:31 +00:00