Commit Graph
22224 Commits
Author SHA1 Message Date
Douwe Maan 690aafebdb Merge branch 'group_settings_nav' into 'master'
Fix consistency issue in sidebars of Project and Group Settings.

Fixes #2277

![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png)

See merge request !1871
2015-07-01 09:32:41 +00:00
Dmitriy Zaporozhets 2d85458ac7 Merge branch 'fix-zero-sha-lookup' into 'master'
Repository#blob_at should return nil for 00000000... sha

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

See merge request !916
2015-07-01 09:30:43 +00:00
Dmitriy Zaporozhets b096374dd5 Mention performance improvements after adding cache to some fragments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 11:24:54 +02:00
Dmitriy Zaporozhets 15743123c9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-01 11:21:40 +02:00
Dmitriy Zaporozhets 87df927f20 Merge branch 'reporter-manage-issues' into 'master'
Reporter role can manage issue tracker now

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

See merge request !908
2015-07-01 09:19:56 +00:00
Dmitriy Zaporozhets d75f16c2ec Fix commits feed button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 11:19:07 +02:00
Dmitriy Zaporozhets baf12f45d8 Repository#blob_at should return nil for 00000000... sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 11:02:37 +02:00
Job van der Voort d18f1ce75d Merge branch 'k-devise' into 'master'
added note about Devise

Added note about the authentication gem used in GitLab

Because of question in https://groups.google.com/forum/#!topic/gitlabhq/G2rToah19-Q

See merge request !912
2015-07-01 08:46:26 +00:00
Job van der Voort 36ecc6d305 Merge branch 'commandline' into 'master'
added new doc "command line commands"

Added new doc to GitLab Basics

See merge request !1880
2015-07-01 08:28:08 +00:00
Dmitriy Zaporozhets e934a62aeb Merge branch 'cache-commits-render' into 'master'
Performance improvements after caching html fragments

* re-use event cache with other users
* cache commit fragment
* cache issue fragment in list
* cache comment parsed with markdown

See merge request !911
2015-07-01 08:19:43 +00:00
Dmitriy Zaporozhets 0af73977e8 Merge branch 'rs-fix-application-helper-specs' into 'master'
Fix ApplicationHelper specs

On current `master` if you run these specs by themselves, they fail. I have no idea why they work when run with other specs, but now they work all the time.

- Use the `helper` object, as per RSpec 3 standards
- Use `assign` to assign instance variables that helpers expect
- Add `StubConfiguration` support module

See merge request !906
2015-07-01 08:19:16 +00:00
Dmitriy Zaporozhets 70666a52b4 Use to_reference menthod when render issue id in list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 09:46:37 +02:00
Robert Speicher 3078b13e72 Gem updates for security issues
- sprockets (rails dependency, but we need to specify a version to pull
  in fixes)
- sass-rails (no security issues, but required an update to meet new
  sprockets version requirement)
- rest-client (coveralls dependency)
2015-06-30 21:38:26 -04:00
Robert Speicher a373422adf Merge branch 'rs-issue-1911' into 'master'
Bump Redcarpet to 3.3.2

Closes #1911

See merge request !913
2015-07-01 00:53:08 +00:00
Robert Speicher c5b9d4720e Bump Redcarpet to 3.3.2
Closes #1911
2015-06-30 18:18:51 -04:00
Robert Speicher 42b643f057 Fix ApplicationHelper specs
There were several specs that were failing when run by themselves.

- Use the `helper` object, as per RSpec 3 standards
- Use `assign` to assign instance variables that helpers expect
- Add `StubConfiguration` support module
2015-06-30 17:47:53 -04:00
Robert Speicher 366799bbf1 Add spec/support/factory_girl
Just for consistency with our Capybara, DatabaseCleaner, WebMock, etc.
setups.
2015-06-30 17:47:53 -04:00
karen Carias e0e8985855 small fixes 2015-06-30 12:49:51 -07:00
karen Carias 7b7dd96b7d organized commands 2015-06-30 12:45:21 -07:00
karen Carias 9e4a4667d9 fixed note 2015-06-30 12:25:36 -07:00
karen Carias bea0b6df38 added note about Devise 2015-06-30 11:42:33 -07:00
karen Carias af93e043da fixed typo 2015-06-30 09:10:27 -07:00
karen Carias fddeb0184c added new links 2015-06-30 09:03:10 -07:00
karen Carias 1c9cca5e06 renamed files with hyphen 2015-06-30 08:57:17 -07:00
Dmitriy Zaporozhets 4d80360bed Cache markdown of comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 15:54:20 +02:00
Dmitriy Zaporozhets 40e31e1db3 Cache issue in the list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 15:48:19 +02:00
Dmitriy Zaporozhets 496f94de4a Cache commits list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 15:41:25 +02:00
Dmitriy Zaporozhets b76659c537 Re-use event cache with other users unless its personal
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 15:34:16 +02:00
Jacob Vosmaer a7773dd7e5 7.12 has been released 2015-06-30 15:27:57 +02:00
Dmitriy Zaporozhets f9261e6596 Open big avatar when click on user image
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 15:23:32 +02:00
Dmitriy Zaporozhets b42c40bff3 Make commits atom feed button smaller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 15:13:18 +02:00
Dmitriy Zaporozhets 1e6ec57397 Merge branch 'reuse-html-pipeline' into 'master'
Reuse HTML Pipeline object in Markdown parser

The patches reduces pressure on GC and reduces markdown processing time

See merge request !905
2015-06-30 13:03:03 +00:00
Kamil Trzcinski a34c61d9c6 Reuse HTML Pipeline object in Markdown parser
The patches reduces pressure on GC and reduces markdown processing time
2015-06-30 13:59:27 +02:00
Dmitriy Zaporozhets 16c71a3bab Merge branch 'docker-ci' into 'master'
Added missing packages required by docker builds

This fixes backup failed tests, missing commands: `pg_dump` and `mysqldump`.

See merge request !889
2015-06-30 11:56:31 +00:00
Dmitriy Zaporozhets a5b54f919a Reporter role can manage issue tracker now
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 13:33:02 +02:00
Stan Hu e489b07d2b Merge branch 'fix-c-prototype-highlighting' into 'master'
Bump rugments to 1.0.0beta8 to fix C prototype function highlighting

Closes #1890

See merge request !902
2015-06-30 05:32:56 +00:00
karen Carias 437ecdf2b0 fixed title 2015-06-29 19:03:17 -07:00
karen Carias 5f38703bdc split to 2 documents 2015-06-29 18:53:51 -07:00
Dmitriy Zaporozhets 1161c93661 Merge branch 'doc-style' into 'master'
update documentation styleguide

See merge request !904
2015-06-29 15:24:49 +00:00
Job van der Voort fdabe90ac5 update documentation styleguide 2015-06-29 15:17:53 +00:00
Stan Hu e3dbaa7027 Merge branch '1791-fix-github-issue-order' into 'master'
Fix wrong order of issues when importing from github

### 1. What does this MR do?

The order of issues imported from GitHub is fixed.

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

Nothing.

### 3. Why was this MR needed?

The default behaviors of GitHub API at listing issues are sort: :created and direction: :desc.

See GitHub API details at https://developer.github.com/v3/issues/#list-issues.

### 4. What are the relevant issue numbers / Feature requests?

Fixes #1791

### 5. Screenshots (if relevant)

Nothing

See merge request !898
2015-06-29 14:15:47 +00:00
Dmitriy Zaporozhets 88162f6970 Merge branch 'fix-relative-submodule-namespace-path' into 'master'
Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path

### What does this MR do?

This MR fixes a bug in resolving a namespace when the `name` differed from `path`.

### Why was this MR needed?

The original code was using `name`, when the proper input to `namespace_project_path` was `path`.

### What are the relevant issue numbers?

Closes #1849

See merge request !864
2015-06-29 14:04:04 +00:00
Dmitriy Zaporozhets 8e6efc5e75 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-29 15:38:23 +02:00
Dmitriy Zaporozhets 155b035b00 Merge branch 'add_to_backup_docs' into 'master'
Explain warnings when using omnibus packages with backup restore

Instead of adding this to the omnibus documentation as proposed [here](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/392), moving to one central place as part of efforts to have central location for the docs.

See merge request !903
2015-06-29 13:37:54 +00:00
Job van der Voort 4b69c0a9e7 Merge branch 'link-to-saml' into 'master'
Link to SAML docs from doc index

Without this link, the SAML docs are hard to discover.

See merge request !1882
2015-06-29 11:09:44 +00:00
Jacob Vosmaer 3c01ab10fe Link to SAML docs from doc index
Without this link, the SAML docs are hard to discover.
2015-06-29 11:32:40 +02:00
Dmitriy Zaporozhets 32330e8c28 Merge branch 'rs-fix-subscription-feature' into 'master'
Attempt to fix the "I should see that I am [un]subscribed" steps

Makes use of Capybara methods that wait. Hopefully this will fix the
random timing-related failures of this step.

See merge request !853
2015-06-29 08:57:32 +00:00
Dmitriy Zaporozhets ea6ebee4ab Merge branch 'rs-fuubar' into 'master'
Add Fuubar as the default RSpec formatter

- Shows how many specs have been run, how many remaining
- Estimates how long is left
- Instantly shows failures
- Looks awesome 

![Screen_Shot_2015-06-26_at_1.00.47_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/da7c989e04237141d9adb4c4b5898359/Screen_Shot_2015-06-26_at_1.00.47_AM.png)

See merge request !893
2015-06-29 08:45:33 +00:00
Dmitriy Zaporozhets 83d8d611e9 Merge branch 'rs-disables-submit-behavior' into 'master'
Add "Requires Input" JS behavior

This aims to replace all of those `disableButtonIfEmptyField` calls littered throughout views and JS with a simple, clean, markup-based behavior.

While going through all of the old usages, I found a few places where the old behavior wasn't actually working, so... bonus, they work now!

See merge request !900
2015-06-29 08:35:40 +00:00
Dmitriy Zaporozhets 4642dcd591 Merge branch 'rs-update-gitlab-ci' into 'master'
Remove jasmine:ci task, execute teaspoon directly on CI

See merge request !901
2015-06-29 08:32:54 +00:00