0731a7af31
Show only enabled CI projects
...
Since CI is enabled by pushing .gitlab-ci.yml file there is no need to
add CI project via dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 15:00:05 +02:00
183892fde9
Merge branch 'notification-levels' into 'master'
...
Notification levels can now be set on the Project's main page
The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.
Saving is done via a remote form submission and if successful shows the user a flash message:
@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.
@rspeicher hopefully we can include it with the 8.0 release, maybe?
/cc @darby
See merge request !1322
2015-09-21 09:19:32 +00:00
68b15af46c
Fix IssuableContext javascript
...
We were calling `affix` before the events were bound so they never
triggered correctly.
Closes #2597
2015-09-18 16:35:38 -04:00
1ddefa3bea
Merge branch 'master' into notification-levels
2015-09-16 19:54:18 -05:00
1ef2ce95d5
Merge branch 'master' into notification-levels
2015-09-16 19:52:57 -05:00
4c98357f16
Added Global to the drop downs and updated the label of the button to show the current level instead of `Notifications`
2015-09-16 19:46:24 -05:00
fb9cb3f06c
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-15 23:20:00 +02:00
e21deaee8e
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
# Conflicts:
# Gemfile.lock
2015-09-15 22:40:35 +02:00
d9af6f79ed
Change the replace placeholder to use the filename
...
Dynamically adjust placedholder for uploads and fix Dropzone event handlers
Override error handler to prevent error messages from being inserted underneath image preview
Fix tests
Use regexp instead of startsWith for better browser compatibility
Remove duplicate code in _replace.html.haml and use one template
Remove files upon error and retain alert messages until user adds a new file
2015-09-15 13:07:32 -07:00
fa6df2228e
Replaced `this` with `@` in the coffee file and added an arrow that clearly marks the Notifications button as a drop down
2015-09-14 20:50:13 -05:00
01cc20378b
Notification dropdown now shows currently active level, and also shows what the actual value of `global` is, if the project has the notification level set to global.
2015-09-14 20:33:24 -05:00
81e741af24
Merge pull request #9138 from liyakun/master
...
add "replace" and "upload" functionality
2015-09-14 17:57:41 -07:00
adcae6ebd5
Notification level can now be saved from within the project view.
2015-09-14 19:27:54 -05:00
e2ece2bc35
Add "Replace" and "Upload" features
...
Refactor upload and replace functionality
Rename file and move CSS
Fix typo
Make dropzone a div
Remove unnecessary file
Change color of "upload existing one"
Add missing changes
2015-09-15 02:12:56 +02:00
15eeae5fa8
Fix 500 when search for gitlab projects
2015-09-11 19:59:39 +02:00
2b683807b5
Use GitLab UI when render CI
2015-09-11 19:25:53 +02:00
e3c30bf2e8
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-11 16:32:11 +02:00
19c0bf2723
Simplify syntax highlighting of new notes
2015-09-10 15:38:25 -04:00
4e54b82326
Apply syntax highlighting to Markdown previews
2015-09-10 15:38:24 -04:00
404a01ab14
Add specs for syntax_highlight JS
...
Also makes it work when given a parent element containing a
`.js-syntax-highlight` element so for dynamically-added things like
notes or Markdown previews, we can more accurately target just the
element we care about.
2015-09-10 15:38:24 -04:00
0b5d627cd4
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-09 14:56:02 +02:00
b9df499860
Merge branch 'rs-dev-issue-2466' into 'master'
...
Remove style attribute from textarea during ZenMode activation
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
Closes https://github.com/gitlabhq/gitlabhq/issues/8963
See merge request !1248
2015-09-07 09:20:00 +00:00
38f1d571fe
Remove style attribute from textarea during ZenMode activation
...
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
2015-09-04 18:01:36 -04:00
cc22a2640f
Add syntax highlight scheme to notes rendered client-side
2015-09-04 17:07:24 -04:00
ce9cb516a1
Fix tab toggle on activity
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 19:27:13 +02:00
63ba17c4db
Redesign activity feed on dashboard and project pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03 13:46:11 +02:00
1fdf56c95d
Prevent anchors from being hidden by header upon a new page load.
...
Browsers change the scroll position after the page is loaded, and the current 1 ms
delay wasn't long enough for the browser to jump to the anchor. Even then, it appears
another 100ms delay is necessary to adjust the scroll properly:
http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict
Add a little more of an offset to see a few lines before the anchor.
Closes #1614
Closes #1024
2015-08-29 02:05:37 -07:00
30555c1d24
Merge branch 'rs-remove-user-color-scheme-class' into 'master'
...
Apply syntax highlighting to fenced code blocks client-side
Instead of applying the syntax highlighting scheme class to these blocks
server-side, we use Javascript and Gon to apply the user's color scheme
(or the default) client-side.
This will make it easier to cache these blocks in the future because
they're no longer state-dependent.
See merge request !1203
2015-08-27 16:24:51 +00:00
843694f902
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-08-26 17:53:31 -07:00
6afd69f444
Update gitignore, change literal DB table names, fix errors, fix fontawesome
2015-08-26 17:47:18 -07:00
b54358b457
Refactor project list rendering
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 22:44:02 +02:00
046b283127
Groundwork for merging CI into CE
2015-08-25 18:42:46 -07:00
2c3e42e4a4
Remove user_color_scheme_class
...
Instead of rendering this value server-side, we use Javascript and Gon
to apply the user's color scheme (or the default) to any syntax
highlighted code blocks.
This will make it easier to cache these blocks in the future because
they're no longer state-dependent.
2015-08-25 15:32:38 -07:00
a0284b5b85
Merge branch 'separate-activity' into 'master'
...
Separate activity page
Move activity to separate page.
Part of #2225
See merge request !1198
2015-08-25 16:19:12 +00:00
c11e43145f
Make some visual improvements to dashboard page after we moved activity
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-25 15:23:25 +02:00
8f68c38746
Dashboard activity as separate page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-25 14:13:04 +02:00
e02b7bf443
Improve abuse reports management
...
* Link to user profile instead of user admin page
* One button for remove user and report
* Remove user and report with page reloading
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-25 10:52:10 +02:00
0daa21ed8c
Merge branch 'fix-email-autocomplete' into 'master'
...
Fix bug preventing invite by e-mail
This was broken in 70f5291808Closes #2320
See merge request !1181
2015-08-21 22:25:59 +00:00
3715a0f29b
Fix bug preventing invite by e-mail
...
This was broken in 70f5291808Closes #2320
2015-08-21 13:47:56 -07:00
9bd6c41a02
Merge branch 'commit-image-branch' into 'master'
...
Fixed JS issue with diff image loading
Fixes #1323
Whilst I couldn't reproduce the error locally, I did manage to get the same JS error message that was in the live env.
See merge request !463
2015-08-21 15:11:09 +00:00
4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
518aa7dca6
Bring clone bar back
...
See discussion in !1080
2015-08-12 14:00:59 -07:00
48e76c04a7
Refactor merge request widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 19:17:02 +02:00
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
84727fba96
Revert "Merge branch 'improve-merge-requests' into 'master'
"
...
This reverts commit 4773f38e280d5d80b735
2015-08-11 10:26:19 +02:00
17bab5022f
Add dropzone upload progress
2015-08-10 13:18:02 +06:00
3cf4a981d6
Refactor merge request widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 15:17:10 +02:00
957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
caf4c0dd87
Merge branch 'ci-skipped-status' into 'master'
...
Added support for CI skipped status
This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216
See merge request !1073
2015-08-05 10:09:07 +00:00
Dmitriy Zaporozhets
Douwe Maan
Robert Speicher
Patricio Cano
Kamil Trzcinski
Stan Hu
liyakun
Nikita Verkhovin
